diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 5551f92c952..5782621bd63 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -469,7 +469,7 @@ class grade_report_grader extends grade_report {
                            AND e.status = :estatus
                            AND e.courseid = :courseid
                   GROUP BY ue.userid";
-            $coursecontext = get_course_context($this->context);
+            $coursecontext = $this->context->get_course_context(true);
             $params = array_merge($uparams, array('estatus'=>ENROL_INSTANCE_ENABLED, 'uestatus'=>ENROL_USER_ACTIVE, 'courseid'=>$coursecontext->instanceid));
             $useractiveenrolments = $DB->get_records_sql($sql, $params);
 
diff --git a/lib/accesslib.php b/lib/accesslib.php
index c1e1f082d08..9d055344f39 100644
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -7247,18 +7247,6 @@ function context_instance_preload_sql($joinon, $contextlevel, $tablealias) {
     return array($select, $join);
 }
 
-/**
- * Is this context part of any course? if yes return course context,
- * if not return null or throw exception.
- *
- * @deprecated since 2.2, use $context->get_course_context() instead
- * @param context $context
- * @return course_context context of the enclosing course, null if not found or exception
- */
-function get_course_context(context $context) {
-    return $context->get_course_context(true);
-}
-
 /**
  * Returns current course id or null if outside of course based on context parameter.
  *
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index fbeb3eed222..6994a70460f 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -4153,3 +4153,16 @@ function get_context_url(context $context) {
     return $context->get_url();
 }
 
+/**
+ * Is this context part of any course? if yes return course context,
+ * if not return null or throw exception.
+ *
+ * @deprecated since 2.2
+ * @see context::get_course_context()
+ * @param context $context
+ * @return course_context context of the enclosing course, null if not found or exception
+ */
+function get_course_context(context $context) {
+    debugging('get_course_context() is deprecated, please use $context->get_course_context(true) instead.', DEBUG_DEVELOPER);
+    return $context->get_course_context(true);
+}
diff --git a/lib/filebrowser/file_info_context_module.php b/lib/filebrowser/file_info_context_module.php
index 5bd064d797b..c62f83adbf5 100644
--- a/lib/filebrowser/file_info_context_module.php
+++ b/lib/filebrowser/file_info_context_module.php
@@ -94,7 +94,7 @@ class file_info_context_module extends file_info {
             return null;
         }
 
-        $coursecontext = get_course_context($this->context);
+        $coursecontext = $this->context->get_course_context(true);
         if (!$this->course->visible and !has_capability('moodle/course:viewhiddencourses', $coursecontext)) {
             return null;
         }
diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php
index 202ba0d0f54..9c9f8d846dd 100644
--- a/lib/tests/accesslib_test.php
+++ b/lib/tests/accesslib_test.php
@@ -2484,8 +2484,11 @@ class accesslib_testcase extends advanced_testcase {
 
         $pagecm = get_coursemodule_from_instance('page', $testpages[7]);
         $context = context_module::instance($pagecm->id);
-        $coursecontext = get_course_context($context);
-        $this->assertEquals($coursecontext->contextlevel, CONTEXT_COURSE);
+        $coursecontext1 = get_course_context($context);
+        $this->assertDebuggingCalled('get_course_context() is deprecated, please use $context->get_course_context(true) instead.', DEBUG_DEVELOPER);
+        $coursecontext2 = $context->get_course_context(true);
+        $this->assertEquals($coursecontext1, $coursecontext2);
+        $this->assertEquals($coursecontext2->contextlevel, CONTEXT_COURSE);
         $this->assertEquals(get_courseid_from_context($context), $pagecm->course);
 
         $caps = fetch_context_capabilities($systemcontext);
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index e1db02f2559..d22ae504a89 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -25,6 +25,7 @@ information provided here is intended especially for developers.
 * mark_context_dirty($context->path) is deprecated, please use $context->mark_dirty().
 * delete_context() is deprecated, please use $context->delete_content() or context_helper::delete_instance().
 * get_context_url() is deprecated, please use $context->get_url().
+* get_course_context() is deprecated, please use $context->get_course_context().
 
 === 2.5.1 ===
 
diff --git a/repository/coursefiles/lib.php b/repository/coursefiles/lib.php
index cee6d858f2d..0f795ba6d53 100644
--- a/repository/coursefiles/lib.php
+++ b/repository/coursefiles/lib.php
@@ -183,7 +183,7 @@ class repository_coursefiles extends repository {
     public function get_name() {
         list($context, $course, $cm) = get_context_info_array($this->context->id);
         if (!empty($course)) {
-            return get_string('courselegacyfiles') . format_string($course->shortname, true, array('context' => get_course_context($context)));
+            return get_string('courselegacyfiles') . format_string($course->shortname, true, array('context' => $context->get_course_context(true)));
         } else {
             return get_string('courselegacyfiles');
         }