Revert r57699. It's causing regressions in