This reverts commit ce23515f5ab01161c98449d833b3ae013b553aa8. That commit broke some builds on Windows: http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/13870