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