
This reverts commit 0197eac3330c04a49519f3e4dac38c4de605c654. The changes break Armv7/Aarch64 toolchain builders: * http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/5570 * http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64/builds/5600