Revert r64834, hasty and unnecessary