Revert r84984 and r85314