revert r61368.