Reverting r343415 as it breaks at least one of the bots.

http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/37336

llvm-svn: 343418
GitOrigin-RevId: 873a50901b9d2281eb2a4b40d7e19c5172c9f92b
19 files changed