Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.569
diff -u -p -r1.569 taxonomy.module
--- modules/taxonomy/taxonomy.module	25 Jan 2010 17:04:03 -0000	1.569
+++ modules/taxonomy/taxonomy.module	28 Jan 2010 15:04:08 -0000
@@ -342,7 +342,6 @@ function taxonomy_vocabulary_save($vocab
   elseif (empty($vocabulary->vid)) {
     $status = drupal_write_record('taxonomy_vocabulary', $vocabulary);
     field_attach_create_bundle('taxonomy_term', $vocabulary->machine_name);
-    taxonomy_vocabulary_create_field($vocabulary);
     module_invoke_all('taxonomy_vocabulary_insert', $vocabulary);
   }
 
@@ -422,31 +421,6 @@ function taxonomy_check_vocabulary_hiera
 }
 
 /**
- * Create a default field when a vocabulary is created.
- *
- * @param $vocabulary
- *   A taxonomy vocabulary object.
- */
-function taxonomy_vocabulary_create_field($vocabulary) {
-  $field = array(
-    'field_name' => 'taxonomy_' . $vocabulary->machine_name,
-    'type' => 'taxonomy_term_reference',
-    // Set cardinality to unlimited so that select
-    // and autocomplete widgets behave as normal.
-    'cardinality' => FIELD_CARDINALITY_UNLIMITED,
-    'settings' => array(
-      'allowed_values' => array(
-        array(
-          'vid' => $vocabulary->vid,
-          'parent' => 0,
-        ),
-      ),
-    ),
-  );
-  field_create_field($field);
-}
-
-/**
  * Save a term object to the database.
  *
  * @param $term
Index: modules/taxonomy/taxonomy.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v
retrieving revision 1.68
diff -u -p -r1.68 taxonomy.test
--- modules/taxonomy/taxonomy.test	10 Jan 2010 22:56:51 -0000	1.68
+++ modules/taxonomy/taxonomy.test	28 Jan 2010 15:04:09 -0000
@@ -323,6 +323,23 @@ class TaxonomyTermTestCase extends Taxon
     $this->drupalLogin($this->admin_user);
     $this->vocabulary = $this->createVocabulary();
 
+    $field = array(
+      'field_name' => 'taxonomy_' . $vocabulary->machine_name,
+      'type' => 'taxonomy_term_reference',
+      // Set cardinality to unlimited so that select
+      // and autocomplete widgets behave as normal.
+      'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+      'settings' => array(
+        'allowed_values' => array(
+          array(
+            'vid' => $vocabulary->vid,
+            'parent' => 0,
+          ),
+        ),
+      ),
+    );
+    field_create_field($field);
+
     $this->instance = array(
       'field_name' => 'taxonomy_' . $this->vocabulary->machine_name,
       'bundle' => 'article',
@@ -855,6 +872,24 @@ class TaxonomyNodeFilterTestCase extends
     $this->vocabulary = $this->createVocabulary();
 
     $this->langcode = LANGUAGE_NONE;
+
+    $field = array(
+      'field_name' => 'taxonomy_' . $vocabulary->machine_name,
+      'type' => 'taxonomy_term_reference',
+      // Set cardinality to unlimited so that select
+      // and autocomplete widgets behave as normal.
+      'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+      'settings' => array(
+        'allowed_values' => array(
+          array(
+            'vid' => $vocabulary->vid,
+            'parent' => 0,
+          ),
+        ),
+      ),
+    );
+    field_create_field($field);
+
     $this->instance = array(
       'field_name' => 'taxonomy_' . $this->vocabulary->machine_name,
       'bundle' => 'article',
Index: profiles/standard/standard.install
===================================================================
RCS file: /cvs/drupal/drupal/profiles/standard/standard.install,v
retrieving revision 1.5
diff -u -p -r1.5 standard.install
--- profiles/standard/standard.install	15 Jan 2010 10:09:03 -0000	1.5
+++ profiles/standard/standard.install	28 Jan 2010 15:04:09 -0000
@@ -304,6 +304,24 @@ function standard_install() {
 
   );
   taxonomy_vocabulary_save($vocabulary);
+
+  $field = array(
+    'field_name' => 'taxonomy_' . $vocabulary->machine_name,
+    'type' => 'taxonomy_term_reference',
+    // Set cardinality to unlimited so that select
+    // and autocomplete widgets behave as normal.
+    'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+    'settings' => array(
+      'allowed_values' => array(
+        array(
+          'vid' => $vocabulary->vid,
+          'parent' => 0,
+        ),
+      ),
+    ),
+  );
+  field_create_field($field);
+
   $instance = array(
     'field_name' => 'taxonomy_' . $vocabulary->machine_name,
     'object_type' => 'node',