Revert Fix for 7666.