diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install
index 9658705..0f6a865 100644
--- a/core/modules/locale/locale.install
+++ b/core/modules/locale/locale.install
@@ -37,7 +37,6 @@ function locale_uninstall() {
 
   // Clear variables.
   state()->delete('system.javascript_parsed');
-  variable_del('locale_cache_length');
   state()->delete('locale.translation.plurals');
   state()->delete('locale.translation.javascript');
 
@@ -721,30 +720,18 @@ function locale_update_8007() {
 }
 
 /**
- * Rename the option variables of the locale language negotiation.
+ * Update locale variables to config or state systems as appropriate.
  *
  * @ingroup config_upgrade
  */
 function locale_update_8008() {
-  $variable_name_map = array(
-    'locale_language_negotiation_url_part' => 'language_negotiation_url_part',
-    'locale_language_negotiation_url_domains' => 'language_negotiation_url_domains',
-    'locale_language_negotiation_url_prefixes' => 'language_negotiation_url_prefixes',
-    'locale_language_negotiation_session_param' => 'language_negotiation_session_param',
-  );
-  foreach ($variable_name_map as $deprecated_variable_name => $new_variable_name) {
-    // Check if this variable is stored in the db and if so rename it.
-    $value = update_variable_get($deprecated_variable_name);
-    if ($value !== NULL) {
-      update_variable_set($new_variable_name, $value);
-      update_variable_del($deprecated_variable_name);
-    }
-  }
   update_variables_to_config('language.negotiation', array(
+    'locale_cache_strings' => 'cache_strings',
     'locale_language_negotiation_session_param' => 'session.parameter',
-    'language_negotiation_url_part' => 'url.source',
-    'language_negotiation_url_prefixes' => 'url.prefixes',
-    'language_negotiation_url_domains' => 'url.domains',
+    'locale_language_negotiation_url_part' => 'url.source',
+    'locale_language_negotiation_url_prefixes' => 'url.prefixes',
+    'locale_language_negotiation_url_domains' => 'url.domains',
+    'locale_js_directory' => 'javascript.directory',
   ));
 }