There seems to be no good reason to change group membership when exchanging tokens, let's try just passing the old one over.
