diff --git a/nova/conf/__init__.py b/nova/conf/__init__.py
index a63e3a392..3b66a3965 100644
--- a/nova/conf/__init__.py
+++ b/nova/conf/__init__.py
@@ -21,7 +21,7 @@ from oslo_config import cfg
 
 # from nova.conf import api
 # from nova.conf import api_database
-# from nova.conf import availability_zone
+from nova.conf import availability_zone
 # from nova.conf import aws
 # from nova.conf import barbican
 # from nova.conf import base
@@ -81,7 +81,7 @@ CONF = cfg.CONF
 
 # api.register_opts(CONF)
 # api_database.register_opts(CONF)
-# availability_zone.register_opts(CONF)
+availability_zone.register_opts(CONF)
 # aws.register_opts(CONF)
 # barbican.register_opts(CONF)
 # base.register_opts(CONF)