AaronBallman wrote: There are still broken bots from this change: https://lab.llvm.org/buildbot/#/builders/124/builds/8595 @zjaffal, please revert the changes until you have a fix ready. https://github.com/llvm/llvm-project/pull/66214