stopped using other.equals(this) as a fallback comparison

Change-Id: I0ae839c7724ac1ee822535a10ce9a2f581ce96ce