revert r159851.