Hi, YES, VERY ANNOYING
but … what I did is to put all water in the initial wagon and uncheck it everywhere else.
This way, only the wagon gets filled … and I don’t care about it
Came here to bring up this exact problem. Both my storage yards were completely filled with water, and no villagers were taking the water back out. It took YEARS for it to finally dwindle. Meanwhile I have no storage. Terrible system.