diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index a3500fd..ecc0069 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -13,12 +13,10 @@
  */
 function language_admin_overview_form($form, &$form_state) {
   drupal_static_reset('language_list');
-  $languages = language_list();
-  $default = language_default();
+  $form_state['languages'] = $languages = language_list(LANGUAGE_ALL);
+  $form_state['language_default'] = $default = language_default();
 
   $form['languages'] = array(
-    '#languages' => $languages,
-    '#language_default' => $default,
     '#type' => 'table',
     '#header' => array(
       t('Name'),
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index fb72927..aef32dd 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -699,7 +699,7 @@ function locale_library_info_alter(&$libraries, $module) {
  * Implements hook_form_FORM_ID_alter() for language_admin_overview_form().
  */
 function locale_form_language_admin_overview_form_alter(&$form, &$form_state) {
-  $languages = $form['languages']['#languages'];
+  $languages = $form_state['languages']['#languages'];
 
   $total_strings = locale_storage()->countStrings();
   $stats = array_fill_keys(array_keys($languages), array());