diff --git a/ironic/netconf.py b/ironic/netconf.py
index a74367667e..1f48092694 100644
--- a/ironic/netconf.py
+++ b/ironic/netconf.py
@@ -46,13 +46,6 @@ netconf_opts = [
     cfg.StrOpt('my_ip',
                default=_get_my_ip(),
                help='ip address of this host'),
-    cfg.StrOpt('host',
-               default=socket.gethostname(),
-               help='Name of this node.  This can be an opaque identifier.  '
-                    'It is not necessarily a hostname, FQDN, or IP address. '
-                    'However, the node name must be valid within '
-                    'an AMQP key, and if using ZeroMQ, a valid '
-                    'hostname, FQDN, or IP address'),
     cfg.BoolOpt('use_ipv6',
                 default=False,
                 help='use ipv6'),
diff --git a/ironic/tests/conf_fixture.py b/ironic/tests/conf_fixture.py
index 2abe431f21..77492d8639 100644
--- a/ironic/tests/conf_fixture.py
+++ b/ironic/tests/conf_fixture.py
@@ -23,7 +23,7 @@ from ironic.common import config
 
 CONF = cfg.CONF
 CONF.import_opt('use_ipv6', 'ironic.netconf')
-CONF.import_opt('host', 'ironic.netconf')
+CONF.import_opt('host', 'ironic.common.service')
 
 
 class ConfFixture(fixtures.Fixture):