Bug 1035007 - Make sure hostname is inserted in the right place. r=mcmanus, a=1.3.x+