This reverts commit 1043107ce5. This commit caused a breakage in `finalizing-bufferize.mlir`.
1043107ce5