Revert "SQ(?) nwrap: don't fail re-adding the same entry"