diff --git a/src/settings_default.py b/src/settings_default.py
index 80daef1c3c..7759e89953 100644
--- a/src/settings_default.py
+++ b/src/settings_default.py
@@ -560,7 +560,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',  # 1.4?
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',)
 # Context processors define context variables, generally for the template
 # system to use.
diff --git a/src/web/urls.py b/src/web/urls.py
index ea9e1576bc..02299ac57e 100755
--- a/src/web/urls.py
+++ b/src/web/urls.py
@@ -11,11 +11,11 @@ from django.conf.urls import url, include
 from django.contrib import admin
 from django.views.generic import RedirectView
 
-# fix to resolve lazy-loading bug
-# https://code.djangoproject.com/ticket/10405#comment:11
-from django.db.models.loading import cache as model_cache
-if not model_cache.loaded:
-    model_cache.get_models()
+## fix to resolve lazy-loading bug
+## https://code.djangoproject.com/ticket/10405#comment:11
+#from django.db.models.loading import cache as model_cache
+#if not model_cache.loaded:
+#    model_cache.get_models()
 
 # loop over all settings.INSTALLED_APPS and execute code in
 # files named admin.py in each such app (this will add those