Revert refs/heads customisations, use tmp branch naming instead

Disambiguation between refs/heads and refs/tags is too disruptive
when it comes to parsing tags in various situations throughout the release