Also unset the group after skipping to prevent mayhem

Change-Id: Iff63fef9aea0f563b98704bba20522b12335f662