thurstond wrote: I reverted this in https://github.com/llvm/llvm-project/pull/135525 to hopefully bring the buildbots back to green. Please reland with a fix at your convenience. Thanks! https://github.com/llvm/llvm-project/pull/135429