Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.27
diff -u -r1.27 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	3 Nov 2009 05:27:18 -0000	1.27
+++ modules/field_ui/field_ui.admin.inc	4 Nov 2009 20:12:59 -0000
@@ -812,20 +812,14 @@
     $field = field_read_field($field['field_name']);
   }
 
-  $field_type = field_info_field_types($field['type']);
-
-  $info_function = $field['module'] . '_field_info';
-  $info = $info_function();
-  $description = '<p><strong>' . $info[$field['type']]['label'] . ':</strong> ';
-  $description .= $info[$field['type']]['description'] . '</p>';
-  $form['#prefix'] = '<div class="description">' . $description . '</div>';
+  drupal_set_title(check_plain($instance['label']));
 
   $description = '<p>' . t('These settings apply to the %field field everywhere it is used. These settings impact the way that data is stored in the database and cannot be changed once data has been created.', array('%field' => $instance['label'])) . '</p>';
 
   // Create a form structure for the field values.
   $form['field'] = array(
     '#type' => 'fieldset',
-    '#title' => t('%field field settings', array('%field' => $instance['label'])),
+    '#title' => t('Field settings'),
     '#description' => $description,
     '#tree' => TRUE,
   );
@@ -856,7 +850,7 @@
   // responsible for not returning settings that cannot be changed if
   // the field already has data.
   $form['field']['settings'] = array();
-  $additions = module_invoke($field_type['module'], 'field_settings_form', $field, $instance, $has_data);
+  $additions = module_invoke($field['module'], 'field_settings_form', $field, $instance, $has_data);
   if (is_array($additions)) {
     $form['field']['settings'] = $additions;
   }
@@ -1138,11 +1132,6 @@
     field_ui_default_value_widget($field, $instance, $form, $form_state);
   }
 
-  $info = field_info_field_types($field['type']);
-  $description = '<p><strong>' . $info['label'] . ':</strong> ';
-  $description .= $info['description'] . '</p>';
-  $form['#prefix'] = '<div class="description">' . $description . '</div>';
-
   $has_data = field_has_data($field);
   if ($has_data) {
     $description = '<p>' . t('These settings apply to the %field field everywhere it is used. Because the field already has data, some settings can no longer be changed.', array('%field' => $instance['label'])) . '</p>';