This reverts commit 5dd566b7c7. Causing some buildbot failures that I'm not seeing on MSVC builds.
5dd566b7c7