--- viewfield.install
+++ viewfield.install
@@ -81,19 +81,9 @@
 /**
  * Update vname fields to varchar(128).
  *
- * Removed due to error:
- * @see viewfield_update_6002()
- * @see http://drupal.org/node/1141200
- */
-//function viewfield_update_6001() {
-//}
-
-/**
- * Update vname fields to varchar(128).
- *
  * @see viewfield_field_settings()
  */
-function viewfield_update_6002() {
+function viewfield_update_6001() {
   if ($abort = content_check_update('viewfield')) {
     return $abort;
   }
@@ -114,14 +104,16 @@
       $field_database_info = content_database_info($field);
       $table_name = $field_database_info['table'];
       $vname_info = $field_database_info['columns']['vname'];
+      if ($vname_info['length'] < $new_length) {
       db_change_field($ret, $table_name, $vname_info['column'], $vname_info['column'], array(
         'type' => 'varchar',
-        'length' => $vname_info['length'] < $new_length ? $new_length : $vname_info['length'],
-        'not null' => FALSE,
+          'length' => $new_length,
+          'not null' => TRUE,
         'default' => '',
       ));
     }
   }
+  }
   return $ret;
 }