This reverts commit 04ef765b65040e1df4cafaf3dacc26fa5d48e519. This was causing buildbot failures for premerge: 1. https://lab.llvm.org/staging/#/builders/192/builds/20135
This reverts commit 04ef765b65040e1df4cafaf3dacc26fa5d48e519. This was causing buildbot failures for premerge: 1. https://lab.llvm.org/staging/#/builders/192/builds/20135