Comment 3 for bug 1055503

I have had to revert this because it broke grizzly upgrades. I'm going to work on another fix though.

(The upgrade breakage was because services ended up being registered twice, as well as the host column of the instances table being wrong).