Village garden plot generation is problematic, leading to flooded areas

Village garden plot generation is full of water blocks unconstrained on one or more sides, due to the way the plots traverse elevation.  Inevitably, the growth of the plants updates the water blocks, which then floods the garden and village.

The attached pictures were generated by seed 3392903

P.S. I've also noticed plants generating on top of the water blocks