This reverts commit 695c7d6313d74dc02222f6497d4c4985d67f433f. Breaks windows (e.g. http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/16497) Likely to cause problems with XCode.