This reverts commit 2aca33baf15926afe2520a06b1427a9894226fd2. Broke tests on several bots, see comments on https://reviews.llvm.org/D120305
This reverts commit 2aca33baf15926afe2520a06b1427a9894226fd2. Broke tests on several bots, see comments on https://reviews.llvm.org/D120305