Drink fresh water with hand instead of bathing in it.

Separated into two commits, one to remove the old method, one to add the new one.

I made reasonably slow so ( since your using your hand to cup water ) you will still want to swap out to get the drinking jug as soon as possible as its much nicer.