diff --git a/addressfield.module b/addressfield.module
index 1f2ff87..ccc7bbb 100644
--- a/addressfield.module
+++ b/addressfield.module
@@ -417,28 +417,12 @@ function addressfield_field_widget_settings_form($field, $instance) {
 function addressfield_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   $settings = $instance['widget']['settings'];
 
-  // Generate a specific key used to identify this element to restore a default
-  // value upon AJAX submission regardless of where this element is in the
-  // $form array.
-  $element_key = implode('|', array($element['#entity_type'], $element['#bundle'], $element['#field_name'], $element['#language'], $element['#delta']));
-
-  // Store the key in the element array as a value so it can be easily retrieved
-  // in context in the $form_state['values'] array in the element validator.
-  $element['element_key'] = array(
-    '#type' => 'value',
-    '#value' => $element_key,
-  );
-
   // Get the default address used to build the widget form elements, looking
-  // first in the form state, then in the stored value for the field, and then
+  // in the stored value for the field, and then
   // in the default values of the instance.
   $address = array();
 
-  if (!empty($form_state['addressfield'][$element_key])) {
-    // Use the value from the form_state if available.
-    $address = $form_state['addressfield'][$element_key];
-  }
-  elseif (!empty($items[$delta]['country'])) {
+  if (!empty($items[$delta]['country'])) {
     // Else use the saved value for the field.
     $address = $items[$delta];
   }
@@ -492,16 +476,6 @@ function addressfield_standard_country_validate($element, &$form_state) {
   if ($element['#default_value'] != $element['#value']) {
     $form_state['rebuild'] = TRUE;
   }
-
-  $parents = $element['#parents'];
-  array_pop($parents);
-
-  // Search through the form values to find the current address.
-  $address = drupal_array_get_nested_value($form_state['values'], $parents);
-
-  // Store the present address values in the form state for retrieval by the
-  // widget form regardless of where the widget sits in the $form array.
-  $form_state['addressfield'][$address['element_key']] = array_diff_key($address, array('element_key' => ''));
 }
 
 /**