Handle old behaviour on tags better

Before changes to tags we were using tag as a branch. If old behaviour
is active, treat tag as a branch.