This reverts commit r221924. It appears the commit was a bit premature and is causing bot failures that need further investigation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221939 91177308-0d34-0410-b5e6-96231b3b80d8