Ok. Well he said the first time he drained it, it had a TON of water and the light was coming on all the time. Now he said it is starting to come on less often and there's not near as much water.

So you think he could've just got a hold on some bad diesel and it's just takin it a while to get out?