so the various places that check the full tag first do not have to get
it just to delete it again.

Change-Id: Ib4e3cf1b16988464db875f1b6ac5cf4a0ab60fe5