--- uc_upsell_admin.inc.orig	2011-03-01 14:05:22.000000000 -0800
+++ uc_upsell_admin.inc	2011-03-01 14:03:27.000000000 -0800
@@ -456,10 +456,8 @@
   if ($cache) {
     $termlist = array();
     $termlist[0] = 'Do not restrict by terms';
+    $termlist += taxonomy_form_all();
     $terms = unserialize($cache->data);
-    foreach($terms AS $tid) {
-      $termlist[$tid] = db_result(db_query("SELECT `name` FROM {term_data} WHERE `tid` = %d", $tid));
-    }
    $form['upsell_global']['taxonomy']['restrict_terms'] = array(
       '#type' => 'select',
       '#title' => t('Restrict related-by-taxonomy products by specific terms'),