Revert some #3464 changes that crept in.