Revert changes that snuck in with revision 66724.