This reverts commit dd230142. Failures: http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/4749 http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64/builds/4752