Now handles removing the fqdn. so resolution of short hostnames work