diff --git app/docs/context.449816.patch app/docs/context.449816.patch
index 0d400fc..e69de29 100644
--- app/docs/context.449816.patch
+++ app/docs/context.449816.patch
@@ -1,21 +0,0 @@
-Index: context_ui/context_ui.module
-===================================================================
---- context_ui/context_ui.module	(revision 114)
-+++ context_ui/context_ui.module	(working copy)
-@@ -1320,12 +1320,12 @@ function context_ui_preprocess_page(&$va
-   // If primary + secondary links are pointed at the same menu, provide
-   // contextual trailing by default.
-   if (variable_get('menu_primary_links_source', 'primary-links') == variable_get('menu_secondary_links_source', 'secondary-links')) {
--    $vars['primary_links'] = context_ui_menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'));
--    $vars['secondary_links'] = context_ui_menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 1);
-+    $vars['primary_links'] = theme_get_setting('toggle_primary_links') ? context_ui_menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links')) : $vars['primary_links'];
-+    $vars['secondary_links'] = theme_get_setting('toggle_secondary_links') ? context_ui_menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 1) : $vars['secondary_links'];
-   }
- 
--  $vars['primary_links'] = context_ui_menu_set_active($vars['primary_links']);
--  $vars['secondary_links'] = context_ui_menu_set_active($vars['secondary_links']);
-+  $vars['primary_links'] = theme_get_setting('toggle_primary_links') ? context_ui_menu_set_active($vars['primary_links']) : $vars['primary_links'];
-+  $vars['secondary_links'] = theme_get_setting('toggle_secondary_links') ? context_ui_menu_set_active($vars['secondary_links']) : $vars['secondary_links'];
- 
-   $vars['context_links'] = theme('context_ui_node_links');
- }
diff --git app/drupal/sites/all/modules/contrib/context/context.core.inc app/drupal/sites/all/modules/contrib/context/context.core.inc
index 09672ae..2376291 100644
--- app/drupal/sites/all/modules/contrib/context/context.core.inc
+++ app/drupal/sites/all/modules/contrib/context/context.core.inc
@@ -594,12 +594,12 @@ function context_preprocess_page(&$vars) {
   // If primary + secondary links are pointed at the same menu, provide
   // contextual trailing by default.
   if (variable_get('menu_primary_links_source', 'primary-links') == variable_get('menu_secondary_links_source', 'secondary-links')) {
-    $vars['primary_links'] = context_menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'));
-    $vars['secondary_links'] = context_menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 1);
+    $vars['primary_links'] = theme_get_setting('toggle_primary_links') ? context_ui_menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links')) : $vars['primary_links'];
+    $vars['secondary_links'] = theme_get_setting('toggle_secondary_links') ? context_ui_menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 1) : $vars['secondary_links'];
   }
 
-  $vars['primary_links'] = context_menu_set_active($vars['primary_links']);
-  $vars['secondary_links'] = context_menu_set_active($vars['secondary_links']);
+  $vars['primary_links'] = theme_get_setting('toggle_primary_links') ? context_ui_menu_set_active($vars['primary_links']) : $vars['primary_links'];
+  $vars['secondary_links'] = theme_get_setting('toggle_secondary_links') ? context_ui_menu_set_active($vars['secondary_links']) : $vars['secondary_links'];
 
   if ($context_links = context_links()) {
     $vars['context_links'] = theme('context_links', $context_links);