Remove dependency on fqdn, fixes #2