omjavaid wrote: @mrkajetanp I am wondering if you can revert #130600 and only merge it alongwith #131397. This should at least help us make buildbot green again. Otherwise more failures will keep piling up. https://github.com/llvm/llvm-project/pull/134726