=== modified file 'sites/all/modules/uuid_features/includes/uuid_term.features.inc'
--- sites/all/modules/uuid_features/includes/uuid_term.features.inc	2011-06-30 19:38:12 +0000
+++ sites/all/modules/uuid_features/includes/uuid_term.features.inc	2011-06-30 19:39:11 +0000
@@ -135,11 +135,8 @@
             $data['parent'][$key] = uuid_taxonomy_term_find($parent_uuid);
           }
         }
-
-        $ret = taxonomy_term_save($term /* TODO Term object replaces array $data */);
-
-        // TODO: remove when http://drupal.org/node/860442 is resolved.
-        uuid_set_uuid('taxonomy_term_data', 'tid', $data['tid'], $data['uuid']);
+        $term = (object) $data;
+        $ret = taxonomy_term_save($term);
       }
 
     }

=== modified file 'sites/all/modules/uuid_features/includes/uuid_vocabulary.features.inc'
--- sites/all/modules/uuid_features/includes/uuid_vocabulary.features.inc	2011-06-30 19:38:12 +0000
+++ sites/all/modules/uuid_features/includes/uuid_vocabulary.features.inc	2011-06-30 19:38:44 +0000
@@ -99,6 +99,8 @@
   $vocabs = module_invoke($module, 'uuid_features_default_vocabularies');
   if (!empty($vocabs)) {
     foreach ($vocabs as $vocab) {
+      $vocab = (object) $vocab;
+      $vocab->machine_name = $vocab->uuid;
       $vocabulary = taxonomy_vocabulary_machine_name_load($vocab->machine_name);
 
       if (!empty($vocabulary)) {