This reverts commit 9f4a9d3f. Reverting this change which was a follow-up to 5b72d0e4 which is being reverted due to test failures on Mac/Windows.
