Revert "Hostname Fix"

Reverts magfest/ubersystem-deploy#3

Dom address this in #6. Looks like we both were working from the same point in the code, so this PR now conflicts with his.