Again, please do not map things so they should up a certain way for your golf game.

Do not fold areas back upon themselves to simulate holes.  multipolygon relations should be used instead.

This changeset has been reverted in part or full.