issue #20785: restrict overzelous wiping