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