devajithvs wrote: I was wondering if the reverts should go in a different PR, or it's fine to keep them all in one (then we only need to backport this PR). https://github.com/llvm/llvm-project/pull/190528