Reverted Pull Request 66, and found another way to have correct behavior during a dry-run.