Proper fix for AutoHostname - omniti-labs/kayak issue #4