This reverts commit c0f3dfb9f119bb5f22dd8846f5502b6abaf026d3. Reverted due to an error on the clang-x64-windows-msvc buildbot.