Temporarily reverting 241765, 241768, and 241772 to unbreak the build bots.

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