diff --git a/django/contrib/admin/media/css/changelists.css b/django/contrib/admin/media/css/changelists.css
index 9ff4f724aa..40142f50ca 100644
--- a/django/contrib/admin/media/css/changelists.css
+++ b/django/contrib/admin/media/css/changelists.css
@@ -1,5 +1,3 @@
-@import url('base.css');
-
/* CHANGELISTS */
#changelist {
diff --git a/django/contrib/admin/media/css/dashboard.css b/django/contrib/admin/media/css/dashboard.css
index da814e3daa..88e3b1d640 100644
--- a/django/contrib/admin/media/css/dashboard.css
+++ b/django/contrib/admin/media/css/dashboard.css
@@ -1,5 +1,3 @@
-@import url('base.css');
-
/* DASHBOARD */
.dashboard .module table th {
diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
index 46946b7f14..fbe4b753af 100644
--- a/django/contrib/admin/media/css/forms.css
+++ b/django/contrib/admin/media/css/forms.css
@@ -1,4 +1,3 @@
-@import url('base.css');
@import url('widgets.css');
/* FORM ROWS */
diff --git a/django/contrib/admin/media/css/login.css b/django/contrib/admin/media/css/login.css
index a4391572f6..8d90d12901 100644
--- a/django/contrib/admin/media/css/login.css
+++ b/django/contrib/admin/media/css/login.css
@@ -1,5 +1,3 @@
-@import url('base.css');
-
/* LOGIN FORM */
body.login {
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html
index cbbfcd3f84..e969d1b82d 100644
--- a/django/contrib/admin/templates/admin/base.html
+++ b/django/contrib/admin/templates/admin/base.html
@@ -2,10 +2,12 @@
{% block title %}{% endblock %}
-
+
+
+{% block extrastyle %}{% endblock %}
{% if LANGUAGE_BIDI %}{% endif %}
-{% block extrastyle %}{% endblock %}
+
{% block extrahead %}{% endblock %}
{% block blockbots %}{% endblock %}
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html
index ab63ecf6e0..19d1d7d6fc 100644
--- a/django/contrib/admin/templates/admin/change_form.html
+++ b/django/contrib/admin/templates/admin/change_form.html
@@ -6,7 +6,7 @@
{{ media }}
{% endblock %}
-{% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %}
+{% block extrastyle %}{% endblock %}
{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html
index c5a9ea9c90..02268e9726 100644
--- a/django/contrib/admin/templates/admin/change_list.html
+++ b/django/contrib/admin/templates/admin/change_list.html
@@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %}
{% load adminmedia admin_list i18n %}
-{% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %}
+{% block extrastyle %}{% endblock %}
{% block bodyclass %}change-list{% endblock %}
diff --git a/django/contrib/admin/templates/admin/index.html b/django/contrib/admin/templates/admin/index.html
index 9eb60b8071..03413ba779 100644
--- a/django/contrib/admin/templates/admin/index.html
+++ b/django/contrib/admin/templates/admin/index.html
@@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css{% endblock %}
+{% block extrastyle %}{% endblock %}
{% block coltype %}colMS{% endblock %}
diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html
index 8c7603682b..8f3d088805 100644
--- a/django/contrib/admin/templates/admin/login.html
+++ b/django/contrib/admin/templates/admin/login.html
@@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/login.css{% endblock %}
+{% block extrastyle %}{% load adminmedia %}{% endblock %}
{% block bodyclass %}login{% endblock %}