Revert "Dropping custom equals in favor of isSimilar"

This reverts commit aadeec7d248b6f86e8822813c5ddd67c583c4f49.