Revert r257003