diff --git a/addressfield.module b/addressfield.module
index 177d92b..ce607b5 100644
--- a/addressfield.module
+++ b/addressfield.module
@@ -222,10 +222,10 @@ function _addressfield_render_address(&$format, $address) {
 
       // Add #prefix and #field_suffix to the prefixes and suffixes.
       if (isset($child['#prefix'])) {
-        $child['#prefix'] = (isset($child['#prefix']) ? $child['#prefix'] : '') . $child['#prefix'];
+        $child['#prefix'] = (isset($child['#prefix']) ? $child['#prefix'] : '');
       }
       if (isset($child['#field_suffix'])) {
-        $child['#suffix'] = (isset($child['#suffix']) ? $child['#suffix'] : '') . $child['#field_suffix'];
+        $child['#suffix'] = (isset($child['#suffix']) ? $child['#suffix'] : '');
       }
     }