diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 846b5c024e..21a63c164d 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -524,8 +524,8 @@ def course_listing(request):
         'show_new_library_button': _get_library_creation_status(user),
         'user': request.user,
         'request_course_creator_url': reverse('contentstore.views.request_course_creator'),
-        'course_creator_status': _get_course_creator_status(request.user),
-        'rerun_creator_status': GlobalStaff().has_user(request.user),
+        'course_creator_status': _get_course_creator_status(user),
+        'rerun_creator_status': GlobalStaff().has_user(user),
         'allow_unicode_course_id': settings.FEATURES.get('ALLOW_UNICODE_COURSE_ID', False),
         'allow_course_reruns': settings.FEATURES.get('ALLOW_COURSE_RERUNS', True),
         'is_programs_enabled': programs_config.is_studio_tab_enabled and request.user.is_staff,
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 3c94ee9ed1..364bc5299d 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -167,7 +167,6 @@ FEATURES = {
 
     # Enable support for content libraries. Note that content libraries are
     # only supported in courses using split mongo.
-    'ENABLE_CONTENT_LIBRARIES': True,
     'DISABLE_LIBRARY_CREATION': False,
 
     # Milestones application flag