--- original-video_cck.module	2007-04-20 10:52:14.000000000 -0700
+++ video_cck.module	2007-05-12 21:58:16.000000000 -0700
@@ -376,15 +376,7 @@ function video_cck_widget($op, &$node, $
     case 'form':
       $form = array();
 
-      $form['video_cck_fieldset'] = array(
-        '#type' => 'fieldset',
-        '#title' => t($field['widget']['label']),
-        '#description' => $field['widget']['description'],
-        '#collapsible' => true,
-        '#collapsed' => false,
-      );
-
-      $form['video_cck_fieldset'][$field['field_name']] = array('#tree' => TRUE);
+      $form[$field['field_name']] = array('#tree' => TRUE);
       $textfield = 'embed';
       $field['required'] = FALSE;
       $providers = video_cck_allowed_providers($field);
@@ -396,17 +388,17 @@ function video_cck_widget($op, &$node, $
           $urls[] = l($info['name'], $info['url'], array('target' => '_blank'));
         }
       }
-      $textfield_title = t('Embed Code or Video URL');
+      $textfield_title = t($field['widget']['label']);
       $textfield_description = t('Enter the Embed Code or Video URL here. For instance, you might enter the URL from the address bar of a video at Google Videos, or the code from the Embed bar provided by YouTube. The video will be parsed and displayed appropriately from this.');
       $textfield_description .= '<br />' . t('The following services are provided: !urls', array('!urls' => implode(', ', $urls)));
 
       if ($field['multiple']) {
-        $form['video_cck_fieldset'][$field['field_name']]['#type'] = 'fieldset';
-        $form['video_cck_fieldset'][$field['field_name']]['#title'] = t($field['widget']['label']);
+        $form[$field['field_name']]['#type'] = 'fieldset';
+        $form[$field['field_name']]['#title'] = t($field['widget']['label']);
         $delta = 0;
         foreach ($node_field as $data) {
           if (isset($data[$textfield])) {
-            $form['video_cck_fieldset'][$field['field_name']][$delta][$textfield] = array(
+            $form[$field['field_name']][$delta][$textfield] = array(
               '#type' => 'textfield',
               '#title' => $textfield_title,
               '#description' => $textfield_description,
@@ -414,13 +406,13 @@ function video_cck_widget($op, &$node, $
               '#required' => ($delta == 0) ? $field['required'] : FALSE,
               '#maxlength' => 255,
             );
-            $form['video_cck_fieldset'][$field['field_name']][$delta]['value'] = array(
+            $form[$field['field_name']][$delta]['value'] = array(
               '#type' => 'value',
               '#value' => $data['value'],
             );
             if ($data['value']) {
               $info = video_cck_include_invoke($data['provider'], 'info');
-              $form['video_cck_fieldset'][$field['field_name']][$delta]['markup_value'] = array(
+              $form[$field['field_name']][$delta]['markup_value'] = array(
                 '#type' => 'item',
                 '#value' => t('(@provider Video ID: !value)', array('@provider' => $info['name'], '!value' => l($data['value'], video_cck_include_invoke($info['name'], 'video_link', $data['value']), array('target' => '_blank')))),
               );
@@ -429,7 +421,7 @@ function video_cck_widget($op, &$node, $
           }
         }
         foreach (range($delta, $delta + 2) as $delta) {
-          $form['video_cck_fieldset'][$field['field_name']][$delta][$textfield] = array(
+          $form[$field['field_name']][$delta][$textfield] = array(
             '#type' => 'textfield',
             '#title' => $textfield_title,
             '#description' => $textfield_description,
@@ -437,14 +429,14 @@ function video_cck_widget($op, &$node, $
             '#required' => ($delta == 0) ? $field['required'] : FALSE,
             '#maxlength' => 255,
           );
-          $form['video_cck_fieldset'][$field['field_name']][$delta]['value'] = array(
+          $form[$field['field_name']][$delta]['value'] = array(
             '#type' => 'value',
             '#title' => '',
           );
         }
       }
       else {
-        $form['video_cck_fieldset'][$field['field_name']][0][$textfield] = array(
+        $form[$field['field_name']][0][$textfield] = array(
           '#type' => 'textfield',
           '#title' => $textfield_title, //t($field['widget']['label']),
           '#description' => $textfield_description,
@@ -454,13 +446,13 @@ function video_cck_widget($op, &$node, $
         );
         if ($textfield == 'embed') {
           $value = isset($node_field[0]['value']) ? $node_field[0]['value'] : '';
-          $form['video_cck_fieldset'][$field['field_name']][0]['value'] = array(
+          $form[$field['field_name']][0]['value'] = array(
             '#type' => 'value',
             '#value' => $value,
           );
           if ($value) {
             $info = video_cck_include_invoke($node_field[0]['provider'], 'info');
-            $form['video_cck_fieldset'][$field['field_name']][0]['value_markup'] = array(
+            $form[$field['field_name']][0]['value_markup'] = array(
               '#type' => 'item',
               '#value' => t('(@provider Video ID: !value)', array('@provider' => $info['name'], '!value' => l($value, video_cck_include_invoke($info['name'], 'video_link', $value), array('target' => '_blank')))),
             );