[#73527504] Revert Set to List again. Instead changed the 'equals' method.