Index: plugins/format/address.inc
===================================================================
--- plugins/format/address.inc	(revision 2524)
+++ plugins/format/address.inc	(working copy)
@@ -58,7 +58,6 @@
     '#title' => t('City'),
     '#size' => 30,
     '#required' => TRUE,
-    '#prefix' => ' ',
     '#attributes' => array('class' => array('locality')),
   );
   $format['country'] = array(
@@ -84,7 +83,6 @@
       '#title' => t('State'),
       '#size' => 10,
       '#required' => TRUE,
-      '#prefix' => ' ',
       '#attributes' => array('class' => array('state')),
     );
   }
@@ -328,7 +326,6 @@
   if (in_array($address['country'], array('AU', 'BD', 'BF', 'BH', 'BM', 'BN', 'BT', 'CA', 'FM', 'ID', 'IE', 'IN', 'JM', 'JO', 'KH', 'LB', 'LS', 'LV', 'MM', 'MN', 'MV', 'MW', 'NG', 'NP', 'NZ', 'PE', 'PK', 'PR', 'PW', 'SA', 'SG', 'SO', 'TH', 'US', 'VI', 'VG', 'VN'))) {
     // Take the widget out of the array.
     $postal_code_widget = $format['locality_block']['postal_code'];
-    $postal_code_widget['#prefix'] = ' ';
     unset($format['locality_block']['postal_code']);
 
     // Add it back.