diff --git a/keystone/conf/resource.py b/keystone/conf/resource.py
index 8945d2e570..afed1c3b5a 100644
--- a/keystone/conf/resource.py
+++ b/keystone/conf/resource.py
@@ -17,11 +17,11 @@ from keystone.conf import utils
 
 driver = cfg.StrOpt(
     'driver',
+    default='sql',
     help=utils.fmt("""
 Entry point for the resource driver in the `keystone.resource` namespace. Only
-a `sql` driver is supplied by keystone. If a resource driver is not specified,
-the assignment driver will choose the resource driver to maintain backwards
-compatibility with older configuration files.
+a `sql` driver is supplied by keystone. Unless you are writing proprietary
+drivers for keystone, you do not need to set this option.
 """))
 
 caching = cfg.BoolOpt(
diff --git a/keystone/resource/core.py b/keystone/resource/core.py
index 11c0feb007..0c2397a2f7 100644
--- a/keystone/resource/core.py
+++ b/keystone/resource/core.py
@@ -52,14 +52,7 @@ class Manager(manager.Manager):
     _PROJECT = 'project'
 
     def __init__(self):
-        # If there is a specific driver specified for resource, then use it.
-        # Otherwise retrieve the driver type from the assignment driver.
         resource_driver = CONF.resource.driver
-
-        if resource_driver is None:
-            assignment_manager = dependency.get_provider('assignment_api')
-            resource_driver = assignment_manager.default_resource_driver()
-
         super(Manager, self).__init__(resource_driver)
 
     def _get_hierarchy_depth(self, parents_list):