Reverging equals / hashCode commit until we figure out