Revert "Merge pull request #153 from davecheney/112-state-life-takes-a-tag"

Reverts commit e01ac93e0cbee312bf19ead78035a78ed2428871, to see if jenkins
blame on local-upgrade-precise-amd64 job failure is valid.
Merge pull request #160 from bz2/revert_pr153

Revert "Merge pull request #153 from davecheney/112-state-life-takes-a-tag"

Reverts commit e01ac93e0cbee312bf19ead78035a78ed2428871, to see if jenkins
blame on local-upgrade-precise-amd64 job failure is valid.