https://github.com/dwblaikie approved this pull request. Please commit this when you've a chance to watch the bots relatively carefully - seems fairly likely to cause some undiscovered fallout. https://github.com/llvm/llvm-project/pull/115019