Revert r255115 until we figure out how to fix the bot failures.

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