This reverts commit r244155, as it was breaking the buildbots for too long. Should be reapplied with proper fix. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244205 91177308-0d34-0410-b5e6-96231b3b80d8