Partially revert r253662: some unrelated work was accidentally committed with it.