https://github.com/keshavvinayak01 commented: @shiltian I also saw some of the reverted changes that did something similar. I've already added those changes here, particulary w.r.t what @arsenm requested. https://github.com/llvm/llvm-project/pull/205536