diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 9ff5ac0..d59c8e6 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -331,15 +331,6 @@ function language_configuration_element_process($element, &$form_state, &$form)
     ),
   );
 
-  // Determine where to attach the language_configuration element submit handler.
-  // @todo Form API: Allow form widgets/sections to declare #submit handlers.
-  if (isset($form['actions']['submit'])) {
-    $form['actions']['submit']['#submit'][] = 'language_configuration_element_submit';
-  }
-  else {
-    $form['#submit'][] = 'language_configuration_element_submit';
-  }
-
   return $element;
 }
 
@@ -349,10 +340,7 @@ function language_configuration_element_process($element, &$form_state, &$form)
 function language_configuration_element_submit(&$form, &$form_state) {
   // Iterate through all the language_configuration elements and save their
   // values.
-  if (isset($form_state['language']) && !isset($form_state['language_configuration_saved'])) {
-    // Prevent this from being executed twice.
-    // @todo language_configuration_element_process()
-    $form_state['language_configuration_saved'] = TRUE;
+  if (isset($form_state['language'])) {
     foreach ($form_state['language'] as $element_name => $values) {
       language_save_default_configuration($values['entity_type'], $values['bundle'],  $form_state['values'][$element_name]);
     }