diff --git a/nova/api/openstack/compute/console_auth_tokens.py b/nova/api/openstack/compute/console_auth_tokens.py
index cdd613b241..ff0a2dda30 100644
--- a/nova/api/openstack/compute/console_auth_tokens.py
+++ b/nova/api/openstack/compute/console_auth_tokens.py
@@ -21,8 +21,6 @@ from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova.i18n import _
 from nova.policies import console_auth_tokens as cat_policies
 
-ALIAS = "os-console-auth-tokens"
-
 
 class ConsoleAuthTokensController(wsgi.Controller):
     def __init__(self, *args, **kwargs):
@@ -65,19 +63,3 @@ class ConsoleAuthTokensController(wsgi.Controller):
     @extensions.expected_errors((400, 404))
     def show(self, req, id):
         return self._show(req, id, False)
-
-
-class ConsoleAuthTokens(extensions.V21APIExtensionBase):
-    """Console token authentication support."""
-    name = "ConsoleAuthTokens"
-    alias = ALIAS
-    version = 1
-
-    def get_resources(self):
-        controller = ConsoleAuthTokensController()
-        ext = extensions.ResourceExtension(ALIAS,
-                                           controller)
-        return [ext]
-
-    def get_controller_extensions(self):
-        return []
diff --git a/nova/api/openstack/compute/consoles.py b/nova/api/openstack/compute/consoles.py
index 7cac4d7d1f..0c59278d3c 100644
--- a/nova/api/openstack/compute/consoles.py
+++ b/nova/api/openstack/compute/consoles.py
@@ -22,9 +22,6 @@ from nova import exception
 from nova.policies import consoles as consoles_policies
 
 
-ALIAS = 'os-consoles'
-
-
 def _translate_keys(cons):
     """Coerces a console instance into proper dictionary format."""
     pool = cons['pool']
@@ -105,24 +102,3 @@ class ConsolesController(wsgi.Controller):
                                             int(id))
         except exception.ConsoleNotFound as e:
             raise exc.HTTPNotFound(explanation=e.format_message())
-
-
-class Consoles(extensions.V21APIExtensionBase):
-    """Consoles."""
-
-    name = "Consoles"
-    alias = ALIAS
-    version = 1
-
-    def get_resources(self):
-        parent = {'member_name': 'server',
-                  'collection_name': 'servers'}
-        resources = [
-            extensions.ResourceExtension(
-                'consoles', ConsolesController(), parent=parent,
-                member_name='console')]
-
-        return resources
-
-    def get_controller_extensions(self):
-        return []
diff --git a/nova/api/openstack/compute/routes.py b/nova/api/openstack/compute/routes.py
index c6a82568e6..65801503c2 100644
--- a/nova/api/openstack/compute/routes.py
+++ b/nova/api/openstack/compute/routes.py
@@ -26,7 +26,9 @@ from nova.api.openstack.compute import attach_interfaces
 from nova.api.openstack.compute import availability_zone
 from nova.api.openstack.compute import certificates
 from nova.api.openstack.compute import config_drive
+from nova.api.openstack.compute import console_auth_tokens
 from nova.api.openstack.compute import console_output
+from nova.api.openstack.compute import consoles
 from nova.api.openstack.compute import create_backup
 from nova.api.openstack.compute import deferred_delete
 from nova.api.openstack.compute import evacuate
@@ -244,6 +246,14 @@ server_controller = functools.partial(_create_controller,
 )
 
 
+console_auth_tokens_controller = functools.partial(_create_controller,
+    console_auth_tokens.ConsoleAuthTokensController, [], [])
+
+
+consoles_controller = functools.partial(_create_controller,
+    consoles.ConsolesController, [], [])
+
+
 server_diagnostics_controller = functools.partial(_create_controller,
     server_diagnostics.ServerDiagnosticsController, [], [])
 
@@ -369,6 +379,9 @@ ROUTE_LIST = (
     ('/os-certificates/{id}', {
         'GET': [certificates_controller, 'show']
     }),
+    ('/os-console-auth-tokens/{id}', {
+        'GET': [console_auth_tokens_controller, 'show']
+    }),
     ('/os-fixed-ips/{id}', {
         'GET': [fixed_ips_controller, 'show']
     }),
@@ -523,6 +536,14 @@ ROUTE_LIST = (
     ('/servers/{id}/action', {
         'POST': [server_controller, 'action']
     }),
+    ('/servers/{server_id}/consoles', {
+        'GET': [consoles_controller, 'index'],
+        'POST': [consoles_controller, 'create']
+    }),
+    ('/servers/{server_id}/consoles/{id}', {
+        'GET': [consoles_controller, 'show'],
+        'DELETE': [consoles_controller, 'delete']
+    }),
     ('/servers/{server_id}/diagnostics', {
         'GET': [server_diagnostics_controller, 'index']
     }),
diff --git a/setup.cfg b/setup.cfg
index 678985871c..7f20c96176 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -76,8 +76,6 @@ nova.api.v21.extensions =
     block_device_mapping = nova.api.openstack.compute.block_device_mapping:BlockDeviceMapping
     cells = nova.api.openstack.compute.cells:Cells
     cloudpipe = nova.api.openstack.compute.cloudpipe:Cloudpipe
-    console_auth_tokens = nova.api.openstack.compute.console_auth_tokens:ConsoleAuthTokens
-    consoles = nova.api.openstack.compute.consoles:Consoles
     extension_info = nova.api.openstack.compute.extension_info:ExtensionInfo
     images = nova.api.openstack.compute.images:Images
     image_metadata = nova.api.openstack.compute.image_metadata:ImageMetadata