Another domainless hostname fix (issue #116)