Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.316
diff -u -F^f -r1.316 taxonomy.module
--- modules/taxonomy/taxonomy.module	11 Sep 2006 08:18:24 -0000	1.316
+++ modules/taxonomy/taxonomy.module	13 Sep 2006 23:10:59 -0000
@@ -679,14 +679,10 @@ function taxonomy_form_alter($form_id, &
           '#title' => t('Categories'),
           '#collapsible' => TRUE,
           '#collapsed' => FALSE,
-          '#tree' => TRUE,
-          '#weight' => -3,
         );
       }
-      else {
-        $form['taxonomy'] = array_shift($form['taxonomy']);
-        $form['taxonomy']['#weight'] = -3;
-      }
+      $form['taxonomy']['#weight'] = -3;
+      $form['taxonomy']['#tree'] = TRUE;
     }
   }
 }