diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 9b5fed412..84c2ef948 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -39,17 +39,13 @@ function install_fwaas() {
 }
 
 function configure_fwaas_v1() {
-    echo_summary "Configuring q-fwaas for FWaaS v1"
     neutron_fwaas_configure_driver fwaas
     iniset_multiline $Q_L3_CONF_FILE fwaas agent_version v1
-    NETWORK_API_EXTENSIONS+=,fwaas,fwaasrouterinsertion
 }
 
 function configure_fwaas_v2() {
-    echo_summary "Configuring q-fwaas for FWaaS v2"
     neutron_fwaas_configure_driver fwaas_v2
     iniset_multiline $Q_L3_CONF_FILE fwaas agent_version v2
-    NETWORK_API_EXTENSIONS+=,fwaas_v2
 }
 
 function init_fwaas() {
@@ -104,10 +100,13 @@ if is_service_enabled q-svc && ( is_service_enabled q-fwaas || is_service_enable
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         # Configure after the other layer 1 and 2 services have been configured
         if is_service_enabled q-fwaas-v1; then
+            echo_summary "Configuring q-fwaas for FWaaS v1"
             configure_fwaas_v1
         elif is_service_enabled q-fwaas-v2; then
+            echo_summary "Configuring q-fwaas for FWaaS v2"
             configure_fwaas_v2
         else
+            echo_summary "Configuring q-fwaas for FWaaS v1"
             configure_fwaas_v1
         fi
 
diff --git a/devstack/settings b/devstack/settings
index 46d2bc808..f87f5f621 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,13 +1,3 @@
 FWAAS_DRIVER=${FWAAS_DRIVER:-iptables}
 FWAAS_PLUGIN_V1=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin}
 FWAAS_PLUGIN_V2=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin_v2.FirewallPluginV2}
-
-NETWORK_API_EXTENSIONS=agent,binding,dhcp_agent_scheduler,external-net
-NETWORK_API_EXTENSIONS+=,ext-gw-mode,extra_dhcp_opts,quotas,router
-NETWORK_API_EXTENSIONS+=,security-group,subnet_allocation
-NETWORK_API_EXTENSIONS+=,network-ip-availability,auto-allocated-topology
-NETWORK_API_EXTENSIONS+=,timestamp_core,tag,service-type,rbac-policies
-NETWORK_API_EXTENSIONS+=,standard-attr-description
-NETWORK_API_EXTENSIONS+=,pagination
-NETWORK_API_EXTENSIONS+=,sorting
-NETWORK_API_EXTENSIONS+=,project-id
diff --git a/neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaasv2_extensions.py b/neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaasv2_extensions.py
index 482f7bd19..43dc35584 100644
--- a/neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaasv2_extensions.py
+++ b/neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaasv2_extensions.py
@@ -55,6 +55,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
 
     @classmethod
     def resource_setup(cls):
+        raise cls.skipException("bug 1643844")
         super(FWaaSv2ExtensionTestJSON, cls).resource_setup()
         if not test.is_extension_enabled('fwaas_v2', 'network'):
             msg = "FWaaS v2  Extension not enabled."