4eb7ab27ab
This reverts commit b128aa0499 (#11891)
It *seems* like it's causing several tests to fail on linux?