Breaks some bots, details in https://reviews.llvm.org/D91620 This reverts commit 93b1256e38.
93b1256e38