This reverts commit ee1bf186. It breaks IREE lowering. Reverting the commit for now while we investigate what's going on.