Tags now behave as described, again

Change-Id: I5ab656a48d6bd08e8fe57acacf9dcc556cfa51de
Merge "Tags now behave as described, again"