We had two separate places where we were applying the temporary tag
for the new version. Consolidate that into one place, early in the
processing, so the rest of the logic can assume that the tag exists.
Change-Id: Id712292036abf98124bb41c6650dadbb698b942e
Signed-off-by: Doug Hellmann <doug@doughellmann.com>