Revert "constraints: fix bug in remove_from_equiv()"