This reverts commit r269388. It caused some bots to fail, I'm reverting it until I investigate the issue. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@269395 91177308-0d34-0410-b5e6-96231b3b80d8