diff --git a/course/view.php b/course/view.php
index d9d0bdd564b..cb978d86ab4 100644
--- a/course/view.php
+++ b/course/view.php
@@ -20,7 +20,6 @@
     $marker      = optional_param('marker',-1 , PARAM_INT);
     $switchrole  = optional_param('switchrole',-1, PARAM_INT);
     $modchooser  = optional_param('modchooser', -1, PARAM_BOOL);
-    $return      = optional_param('return', 0, PARAM_LOCALURL);
 
     $params = array();
     if (!empty($name)) {
@@ -153,8 +152,6 @@
             // Redirect to site root if Editing is toggled on frontpage
             if ($course->id == SITEID) {
                 redirect($CFG->wwwroot .'/?redirect=0');
-            } else if (!empty($return)) {
-                redirect($CFG->wwwroot . $return);
             } else {
                 redirect($PAGE->url);
             }
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index dcf466a64a0..b24c1126db0 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -3561,7 +3561,7 @@ class settings_navigation extends navigation_node {
                 $baseurl->param('sesskey', sesskey());
             } else {
                 // Edit on the main course page.
-                $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'return'=>$this->page->url->out_as_local_url(false), 'sesskey'=>sesskey()));
+                $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'sesskey'=>sesskey()));
             }
 
             $editurl = clone($baseurl);