diff --git modules/field/views_handler_field_field.inc modules/field/views_handler_field_field.inc
index eb5a1c0..92f7e6e 100644
--- modules/field/views_handler_field_field.inc
+++ modules/field/views_handler_field_field.inc
@@ -252,7 +252,7 @@ class views_handler_field_field extends views_handler_field {
       'default' => ', '
     );
 
-    $options['entity_api_classes'] = array(
+    $options['field_api_classes'] = array(
       'default' => FALSE,
     );
 
@@ -298,15 +298,15 @@ class views_handler_field_field extends views_handler_field {
       ),
     );
 
-    $form['entity_api_classes'] = array(
+    $form['field_api_classes'] = array(
       '#title' => t('Use field template'),
       '#type' => 'checkbox',
-      '#default_value' => $this->options['entity_api_classes'],
+      '#default_value' => $this->options['field_api_classes'],
       '#description' => t('If checked, field api classes will be added using field.tpl.php (or equivalent). This is not recommended unless your CSS depends upon these classes. If not checked, template will not be used.'),
     );
 
     if ($this->multiple) {
-      $form['entity_api_classes']['#description'] .= ' ' . t('Checking this option will cause the group Display Type and Separator values to be ignored.');
+      $form['field_api_classes']['#description'] .= ' ' . t('Checking this option will cause the group Display Type and Separator values to be ignored.');
     }
 
     // Get the currently selected formatter.
@@ -552,15 +552,14 @@ class views_handler_field_field extends views_handler_field {
       return array();
     }
 
-    // if delta_limit is a non-zero value, this is either an error or they
-    // mean to display all values. Let's just display all values.
+    // if delta_limit is a zero value, that is either an error or they
+    // meant to display all values. So in that case we just display all values.
     if ($this->limit_values && intval($this->options['delta_limit']) != 0) {
       $all_values = $entity->{$this->definition['field_name']}[$langcode];
       if ($this->options['delta_reversed']) {
         $all_values = array_reverse($all_values);
       }
 
-
       // Offset is calculated differently when row grouping for a field is
       // not enabled. Since there are multiple rows, the delta needs to be
       // taken into account, so that different values are shown per row.
@@ -593,7 +592,7 @@ class views_handler_field_field extends views_handler_field {
     $render_array = field_view_field($entity_type, $entity, $this->definition['field_name'], $display, $langcode);
 
     $items = array();
-    if ($this->options['entity_api_classes']) {
+    if ($this->options['field_api_classes']) {
       // Make a copy.
       $array = $render_array;
       return array(array('rendered' => drupal_render($render_array)));