Drinking from a water pump/spigot does work, it just requires over 20 uses to go from "thirsty" to "full" Makes it confusing and assume it isn't functioning at all.

Allow it to fully rehydrate the player on 1-2 uses.