Revert broken r61251 use of strong equality