Index: modules/field/theme/field.tpl.php
===================================================================
RCS file: modules/field/theme/field.tpl.php
diff -N modules/field/theme/field.tpl.php
--- modules/field/theme/field.tpl.php	28 Aug 2009 06:51:07 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-<?php
-// $Id: field.tpl.php,v 1.5 2009/08/28 06:51:07 dries Exp $
-
-/**
- * @file field.tpl.php
- * Default theme implementation to display the value of a field.
- *
- * Available variables:
- * - $items: An array of field values. Use render() to output them.
- * - $label: The item label.
- * - $label_hidden: Whether the label display is set to 'hidden'.
- * - $classes: String of classes that can be used to style contextually through
- *   CSS. It can be manipulated through the variable $classes_array from
- *   preprocess functions. The default values can be one or more of the
- *   following:
- *   - field-name-[field_name]: The current field name. For example, if the
- *     field name is "field_description" it would result in
- *     "field-name-field-description".
- *   - field-type-[field_type]: The current field type. For example, if the
- *     field type is "text" it would result in "field-type-text".
- *   - field-label-[label_display]: The current label position. For example, if the
- *     label position is "above" it would result in "field-label-above".
- *
- * Other variables:
- * - $object: The object to which the field is attached.
- * - $field: The field array.
- * - $build_mode: Build mode, e.g. 'full', 'teaser'...
- * - $field_name: The field name.
- * - $field_type: The field type.
- * - $field_name_css: The css-compatible field name.
- * - $field_type_css: The css-compatible field type.
- * - $field_language: The field language.
- * - $field_translatable: Whether the field is translatable or not.
- * - $label_display: Position of label display, inline, above, or hidden.
- * - $classes_array: Array of html class attribute values. It is flattened
- *   into a string within the variable $classes.
- *
- * @see template_preprocess_field()
- */
-?>
-<?php if ($items) : ?>
-  <div class="field <?php print $classes; ?> clearfix">
-    <?php if (!$label_hidden) : ?>
-      <div class="field-label"><?php print $label ?>:&nbsp;</div>
-    <?php endif; ?>
-    <div class="field-items">
-      <?php foreach ($items as $delta => $item) : ?>
-        <div class="field-item <?php print $delta % 2 ? 'odd' : 'even'; ?>"><?php print render($item); ?></div>
-      <?php endforeach; ?>
-    </div>
-  </div>
-<?php endif; ?>
Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.33
diff -u -r1.33 field.module
--- modules/field/field.module	10 Sep 2009 22:31:58 -0000	1.33
+++ modules/field/field.module	11 Sep 2009 00:55:26 -0000
@@ -152,12 +152,9 @@
  * Implement hook_theme().
  */
 function field_theme() {
-  $path = drupal_get_path('module', 'field') . '/theme';
   $items = array(
     'field' => array(
-      'template' => 'field',
       'arguments' => array('element' => NULL),
-      'path' => $path,
     ),
     'field_multiple_value_form' => array(
       'arguments' => array('element' => NULL),
@@ -165,7 +162,7 @@
   );
   $field_formatters = field_info_formatter_types(NULL);
   foreach ($field_formatters as $key => $field_formatter) {
-	$items["field_formatter_$key"] = array(
+  $items["field_formatter_$key"] = array(
       'arguments' => array('element' => NULL),
     );
   }
@@ -710,52 +707,22 @@
   return $object;
 }
 
-/**
- * Theme preprocess function for field.tpl.php.
- *
- * @see field.tpl.php
- */
-function template_preprocess_field(&$variables) {
-  $element = $variables['element'];
-  list(, , $bundle) = field_extract_ids($element['#object_type'], $element['#object']);
-  $instance = field_info_instance($element['#field_name'], $bundle);
-  $field = field_info_field($element['#field_name']);
-
-  $field_type_css = strtr($field['type'], '_', '-');
-  $field_name_css = strtr($field['field_name'], '_', '-');
-
-  // If the formatter is multiple, the template sees only one 'item', which
-  // will include all values.
+function theme_field($element) {
   $items = $element['#formatter_single'] ? $element['items'] : array($element['items']);
 
-  $additions = array(
-    'object' => $element['#object'],
-    'field' => $field,
-    'instance' => $instance,
-    'build_mode' => $element['#build_mode'],
-    'items' => $items,
-    'field_type' => $field['type'],
-    'field_name' => $field['field_name'],
-    'field_type_css' => $field_type_css,
-    'field_name_css' => $field_name_css,
-    'label' => $element['#title'],
-    'label_display' => $element['#label_display'],
-    'label_hidden' => $element['#label_display'] == 'hidden',
-    'field_language' => $element['#language'],
-    'field_translatable' => $field['translatable'],
-    'classes_array' => array(
-      'field-name-' . $field_name_css,
-      'field-type-' . $field_type_css,
-      'field-label-' . $element['#label_display'],
-    ),
-    'template_files' => array(
-      'field',
-      'field-' . $element['#field_name'],
-      'field-' . $bundle,
-      'field-' . $element['#field_name'] . '-' . $bundle,
-    ),
-  );
-  $variables = array_merge($variables, $additions);
+  $output = '';
+  if ($items) {
+    $output .= '<div class="field field-label-' . $element['#label_display'] . ' clearfix">';
+    if ($element['#label_display'] != 'hidden') {
+      $output .= '<div class="field-label">' . $element['#title'] .':&nbsp;</div>';
+    }
+    $output .= '<div class="field-items">';
+    foreach ($items as $delta => $item) {
+      $output .= '<div class="field-item '. ($delta % 2 ? 'odd' : 'even') . '">' . render($item) . '</div>';
+    }
+    $output .= '</div></div>';
+  }
+  return $output;
 }
 
 /**