diff --git a/web/sites/all/modules/contrib/addressfield/addressfield.module b/web/sites/all/modules/contrib/addressfield/addressfield.module
index bf0bf701..2d849c6d 100644
--- a/web/sites/all/modules/contrib/addressfield/addressfield.module
+++ b/web/sites/all/modules/contrib/addressfield/addressfield.module
@@ -642,7 +642,8 @@ function addressfield_standard_country_validate($element, &$form_state) {
   if ($element['#default_value'] != $element['#value']) {
     $parents = $element['#parents'];
     array_pop($parents);
-    $address = drupal_array_get_nested_value($form_state['values'], $parents);
+    $address_values = drupal_array_get_nested_value($form_state['values'], $parents);
+    $address_input =  drupal_array_get_nested_value($form_state['input'], $parents);
 
     // Clear the country-specific field values.
     $country_specific_data = array(
@@ -651,10 +652,11 @@ function addressfield_standard_country_validate($element, &$form_state) {
       'administrative_area' => '',
       'postal_code' => '',
     );
-    $address = array_diff_key($address, $country_specific_data);
+    $address_values = array_diff_key($address_values, $country_specific_data);
+    $address_input = array_diff_key($address_input, $country_specific_data);
 
-    drupal_array_set_nested_value($form_state['values'], $parents, $address);
-    drupal_array_set_nested_value($form_state['input'], $parents, $address);
+    drupal_array_set_nested_value($form_state['values'], $parents, $address_values);
+    drupal_array_set_nested_value($form_state['input'], $parents, $address_input);
 
     $form_state['rebuild'] = TRUE;
   }