Reverted r347092 due to the following build fails:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/8662
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/26263



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@347129 91177308-0d34-0410-b5e6-96231b3b80d8
27 files changed