diff --git a/neutronclient/neutron/client.py b/neutronclient/neutron/client.py
index 7961a4ca2..d859d815d 100644
--- a/neutronclient/neutron/client.py
+++ b/neutronclient/neutron/client.py
@@ -28,7 +28,7 @@ def make_client(instance):
     """Returns an neutron client."""
     neutron_client = utils.get_client_class(
         API_NAME,
-        instance._api_version[API_NAME],
+        instance._api_version,
         API_VERSIONS,
     )
     instance.initialize()
diff --git a/neutronclient/shell.py b/neutronclient/shell.py
index 4814c8118..6dced26cd 100644
--- a/neutronclient/shell.py
+++ b/neutronclient/shell.py
@@ -596,8 +596,6 @@ class NeutronShell(app.App):
 
         super(NeutronShell, self).initialize_app(argv)
 
-        self.api_version = {'network': self.api_version}
-
         # If the user is not asking for help, make sure they
         # have given us auth.
         cmd_name = None