Revert r85550 and r85575.