This reverts commit 2d2da259. This breaks MLIR integration test (JIT crashing), reverting in the meantime.