I have submitted PR #6816 to temporarily revert GEODE-9486 until it's ready to go back in.
https://github.com/apache/geode/pull/6816 Sha 3b2c53 is failing consistently on Windows, so it needs to be reverted. I hope to have a fix ready sometime next week. Thanks, Kirk
