diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py
index 25b204e4b5..ac655dc909 100644
--- a/nova/api/openstack/compute/contrib/availability_zone.py
+++ b/nova/api/openstack/compute/contrib/availability_zone.py
@@ -65,9 +65,8 @@ class AvailabilityZoneController(wsgi.Controller):
             availability_zones.get_availability_zones(ctxt)
 
         # Available services
-        enabled_services = objects.ServiceList.get_all(context, disabled=False)
-        enabled_services = availability_zones.set_availability_zones(context,
-                enabled_services)
+        enabled_services = objects.ServiceList.get_all(context, disabled=False,
+                                                       set_zones=True)
         zone_hosts = {}
         host_services = {}
         for service in enabled_services:
diff --git a/nova/api/openstack/compute/plugins/v3/availability_zone.py b/nova/api/openstack/compute/plugins/v3/availability_zone.py
index 93488bc4e3..4d882c636a 100644
--- a/nova/api/openstack/compute/plugins/v3/availability_zone.py
+++ b/nova/api/openstack/compute/plugins/v3/availability_zone.py
@@ -63,9 +63,8 @@ class AvailabilityZoneController(wsgi.Controller):
             availability_zones.get_availability_zones(ctxt)
 
         # Available services
-        enabled_services = objects.ServiceList.get_all(context, disabled=False)
-        enabled_services = availability_zones.set_availability_zones(context,
-                enabled_services)
+        enabled_services = objects.ServiceList.get_all(context, disabled=False,
+                                                       set_zones=True)
         zone_hosts = {}
         host_services = {}
         for service in enabled_services:
diff --git a/nova/availability_zones.py b/nova/availability_zones.py
index dfd9602bf4..d42b910578 100644
--- a/nova/availability_zones.py
+++ b/nova/availability_zones.py
@@ -127,8 +127,8 @@ def get_availability_zones(context, get_only_available=False,
         :param with_hosts: whether to return hosts part of the AZs
         :type with_hosts: bool
     """
-    enabled_services = objects.ServiceList.get_all(context, disabled=False)
-    enabled_services = set_availability_zones(context, enabled_services)
+    enabled_services = objects.ServiceList.get_all(context, disabled=False,
+                                                   set_zones=True)
 
     available_zones = []
     for (zone, host) in [(service['availability_zone'], service['host'])
@@ -143,8 +143,8 @@ def get_availability_zones(context, get_only_available=False,
             available_zones = list(_available_zones.items())
 
     if not get_only_available:
-        disabled_services = objects.ServiceList.get_all(context, disabled=True)
-        disabled_services = set_availability_zones(context, disabled_services)
+        disabled_services = objects.ServiceList.get_all(context, disabled=True,
+                                                        set_zones=True)
         not_available_zones = []
         azs = available_zones if not with_hosts else dict(available_zones)
         zones = [(service['availability_zone'], service['host'])