Index: vertical_tabs.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.install,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 vertical_tabs.install
--- vertical_tabs.install	20 Aug 2008 05:34:51 -0000	1.1.2.1
+++ vertical_tabs.install	12 Oct 2008 04:21:07 -0000
@@ -5,5 +5,15 @@
  */
 function vertical_tabs_install() {
   // Make this module pretty heavy.
-  db_query("UPDATE {system} SET weight = 9999999999 WHERE name = '%s'", 'vertical_tabs');
+  db_query("UPDATE {system} SET weight = 300 WHERE name = 'vertical_tabs'");
+}
+
+/**
+ * Reduce the module weight and remove the form settings variable.
+ */
+function vertical_tabs_update_6100() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE {system} SET weight = 300 WHERE name = 'vertical_tabs'");
+  variable_del('vertical_tabs_settings_form');
+  return $ret;
 }
\ No newline at end of file
Index: vertical_tabs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.module,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 vertical_tabs.module
--- vertical_tabs.module	17 Aug 2008 05:58:44 -0000	1.1.2.5
+++ vertical_tabs.module	12 Oct 2008 04:21:07 -0000
@@ -6,44 +6,6 @@
  */
 
 /**
- * Implementation of hook_menu_alter().
- */
-function vertical_tabs_menu_alter(&$items) {
-  $overridden_items = array();
-  $blacklist = array('admin/settings/performance' => TRUE, 'admin/settings/site-information' => TRUE);
-  foreach ($items as $path => $item) {
-    if (strpos($path, 'admin/settings/') === 0) {
-      $root_item = implode('/', array_slice(explode('/', $path), 0, 3));
-      if (count(explode('/', $path)) > 3) {
-        if (isset($overridden_items[$root_item])) {
-          unset($overridden_items[$root_item]);
-        }
-        $blacklist[$root_item] = TRUE;
-      }
-      elseif (!isset($blacklist[$root_item]) && $item['page callback'] == 'drupal_get_form' && !isset($item['title callback'])) {
-        $overridden_items[$path] = $item;
-      }
-    }
-  }
-  $variable = array();
-  foreach ($overridden_items as $path => $item) {
-    unset($items[$path]);
-    $variable[$path]['arguments'] = $item['page arguments'];
-    $variable[$path]['title'] = $item['title'];
-    $variable[$path]['title arguments'] = (isset($item['title arguments']) ? $item['title arguments'] : array());
-    $variable[$path]['description'] = (isset($item['description']) ? $item['description'] : array());
-    $variable[$path]['file'] = (isset($item['file']) ? drupal_get_path('module', $item['module']) .'/'. $item['file'] : '');
-  }
-  variable_set('vertical_tabs_settings_form', $variable);
-  $items['admin/settings/main'] = array(
-    'title' => 'Main configuration',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('vertical_tabs_settings_form'),
-    'access arguments' => array('administer site configuration'),
-  );
-}
-
-/**
  * Implementation of hook_form_alter.
  */
 function vertical_tabs_form_alter(&$form, $form_state, $form_id) {
@@ -68,7 +30,7 @@
     );
     $node_form = TRUE;
   }
-  if ($node_form || $form_id == 'vertical_tabs_settings_form') {
+  if ($node_form) {
     // The javascript to add to the page.
     $javascript = array();
     // Iterate through the form, finding fieldsets.
@@ -99,43 +61,8 @@
     // Indicate that the JavaScript should be added later. We do this so that
     // our JavaScript gets added after collapse.js.
     $form['#post_render'][] = 'vertical_tabs_add_js_css';
-  }
-  if ($node_form) {
     $form['#post_render'][] = 'vertical_tabs_add_node_form_js';
   }
-  else if ($form_id == 'vertical_tabs_settings_form') {
-    $form['#post_render'][] = 'vertical_tabs_add_settings_js';
-  }
-}
-
-/**
- * Form callback - main settings page.
- */
-function vertical_tabs_settings_form(&$form_state) {
-  $form = array();
-  $variable = variable_get('vertical_tabs_settings_form', array());
-  foreach ($variable as $item) {
-    $key = preg_replace('/[^a-z0-9]/', '', strtolower($item['title']));
-    $form[$key] = array(
-      '#type' => 'fieldset',
-      '#title' => t($item['title'], $item['title arguments']),
-      '#description' => t($item['description']),
-      '#collapsible' => TRUE,
-    );
-    $callback = array_shift($item['arguments']);
-    if (isset($item['file']) && !empty($item['file'])) {
-      include_once $item['file'];
-    }
-    array_unshift($item['arguments'], array());
-    $fs = array();
-    $form[$key] += drupal_retrieve_form($callback, $fs, $item['arguments']);
-    if (isset($form[$key]['buttons'])) {
-      unset($form[$key]['buttons']);
-    }
-    $form[$key]['#summary_callback'] = $key;
-  }
-
-  return system_settings_form($form);
 }
 
 /**