--- tabs.js.orig	2010-01-18 09:11:22.000000000 +0100
+++ tabs.js	2010-02-03 14:30:07.125000000 +0100
@@ -20,15 +20,11 @@ Drupal.behaviors.tabs = function (contex
   // Process custom tabs.
   var selected = null;
   $('.drupal-tabs:not(.tabs-processed)', context)
-    .find('> ul')
     .tabs({
       spinner: Drupal.t('Loading...'),
-      // Add the 'active' class when showing tabs and remove it from siblings.
-      show: function(event, ui) {
-        $(ui.tab).parent('li').addClass('active').siblings('li').removeClass('active');
-      },
       fx: fx
     })
+    .find('> ul')
     .addClass('tabs')
     .each(function () {
       // Assign secondary class to nested tabsets.
@@ -55,7 +51,7 @@ Drupal.behaviors.tabs = function (contex
 Drupal.tabs.tabsNavigation = function(elt) {
   // Extract tabset name.
   var tabsetName = $(elt).get(0).id.substring(5);
-  var $tabs = $('> ul', elt);
+  var $tabs = $(elt);
   var i = 1;
   var $tabsContent = $('div.tabs-' + tabsetName, elt);
   var count = $tabsContent.size();
@@ -64,7 +60,7 @@ Drupal.tabs.tabsNavigation = function(el
       $(this).append('<span class="clear"></span><div class="tabs-nav-link-sep"></div>');
     }
     if (i > 1) {
-      var previousText = '‹ ' + (Drupal.settings.tabs.navigation_titles ? $tabs.find('> li:eq(' + parseInt(i - 2) + ')').text() : Drupal.settings.tabs.previous_text);
+      var previousText = '‹ ' + (Drupal.settings.tabs.navigation_titles ? $tabs.find('ul > li:eq(' + parseInt(i - 2) + ')').text() : Drupal.settings.tabs.previous_text);
       var link = $(document.createElement('a'))
         .append('<span>' + previousText + '</span>')
         .attr('id', 'tabs-' + tabsetName + '-previous-link-' + i)
@@ -78,7 +74,7 @@ Drupal.tabs.tabsNavigation = function(el
       $(this).append(link);
     }
     if (i < count) {
-      var nextText = (Drupal.settings.tabs.navigation_titles ? $tabs.find('> li:eq(' + parseInt(i) + ')').text() : Drupal.settings.tabs.next_text) + ' ›';
+      var nextText = (Drupal.settings.tabs.navigation_titles ? $tabs.find('ul > li:eq(' + parseInt(i) + ')').text() : Drupal.settings.tabs.next_text) + ' ›';
       var link = $(document.createElement('a'))
         .append('<span>' + nextText + '</span>')
         .attr('id', 'tabs-' + tabsetName + '-next-button-' + i)