I've reverted the fix on master and 5.2 branch, and removed the assertion on unequal hashCodes from the test.