issue #20785: restrict overzelous wiping
Merge pull request #585 from shackbarth/20785

issue #20785: restrict overzelous wiping