diff --git a/includes/nodeorder.admin.inc b/includes/nodeorder.admin.inc
index c34ac68..b3a18bd 100755
--- a/includes/nodeorder.admin.inc
+++ b/includes/nodeorder.admin.inc
@@ -36,11 +36,11 @@ function nodeorder_admin($form, &$form_state) {
     '#default_value' => variable_get('nodeorder_link_to_ordering_page_taxonomy_admin', 1),
   );
 
-  $form['nodeorder_replace_taxonomy_link'] = array(
+  $form['nodeorder_override_taxonomy_page'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Replace the link to <em>taxonomy/term/%</em> by <em>nodeorder/term/%</em>'),
-    '#description' => t('If enabled, links to regular <em>taxonomy/term/%</em> pages will always be replaced by links to their <em>nodeorder/term/%</em> counterpart. Otherwise, this will only happen on the <em>nodeorder/term/%</em> pages.'),
-    '#default_value' => variable_get('nodeorder_replace_taxonomy_link', 1),
+    '#title' => t('Override the default taxonomy page with one from nodeorder'),
+    '#description' => t('Disabling this will allow the panels module to override taxonomy pages instead. See <a href="https://www.drupal.org/node/1713048">this issue</a> for more information. You will have to clear caches for the change to take effect.'),
+    '#default_value' => variable_get('nodeorder_override_taxonomy_page', 1),
   );
 
   return system_settings_form($form);
diff --git a/nodeorder.install b/nodeorder.install
index e79ff0c..a828342 100644
--- a/nodeorder.install
+++ b/nodeorder.install
@@ -39,6 +39,8 @@ function nodeorder_install() {
 function nodeorder_uninstall() {
   db_drop_index('taxonomy_index', 'weight');
   db_drop_field('taxonomy_index', 'weight');
+  // Delete all variables added by this module.
+  variable_del('nodeorder_*');
 }
 
 /**
@@ -56,3 +58,10 @@ function nodeorder_schema_alter(&$schema) {
     'description' => t('A user-defined weight for each node in its respective category.'),
   );
 }
+
+/**
+ * Remove an obsolete variable.
+ */
+function nodeorder_update_7100() {
+  variable_del('nodeorder_replace_taxonomy_link');
+}
diff --git a/nodeorder.module b/nodeorder.module
index 4c90087..a44b41c 100755
--- a/nodeorder.module
+++ b/nodeorder.module
@@ -39,9 +39,12 @@ function nodeorder_menu() {
  * Implements hook_menu_alter().
  */
 function nodeorder_menu_alter(&$items) {
-  $items['taxonomy/term/%taxonomy_term']['page callback'] = 'nodeorder_taxonomy_term_page';
-  $items['taxonomy/term/%taxonomy_term']['file'] =  'includes/nodeorder.pages.inc';
-  $items['taxonomy/term/%taxonomy_term']['file path'] = drupal_get_path('module', 'nodeorder');
+  // Override the default taxonomy page.
+  if (variable_get('nodeorder_override_taxonomy_page', 1)) {
+    $items['taxonomy/term/%taxonomy_term']['page callback'] = 'nodeorder_taxonomy_term_page';
+    $items['taxonomy/term/%taxonomy_term']['file'] =  'includes/nodeorder.pages.inc';
+    $items['taxonomy/term/%taxonomy_term']['file path'] = drupal_get_path('module', 'nodeorder');
+  }
 }
 
 /**