Was flagged in https://github.com/llvm/llvm-project/pull/124735 but done separately so it didn't get in the way of that.