This reverts commit 8ff4832679e1ff2d2a1cfaa45bb5cb995b0685a1. Breaks tests, see https://reviews.llvm.org/D146811#4232839