I can get behind that. I like the way it's written currently with the sort of "I would like to fill my water here, but that would be a really, obscenely bad idea." but I like having that as an option, after being directly told how obviously stupid it would be. Then each time you pass after, the character can be like "Yeah, not doing that again." sort of like with the empty buggy.
But I agree that a lot of people would probably just be annoyed.