diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index a21682b..0da7ed8 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -445,19 +445,6 @@ function language_get_browser_drupal_langcode_mappings() {
 }
 
 /**
- * Stores language mappings between browser and Drupal language codes.
- *
- * @param array $mappings
- *   An array containing browser language codes as keys with corresponding
- *   Drupal language codes as values.
- */
-function language_set_browser_drupal_langcode_mappings($mappings) {
-  $config = \Drupal::config('language.mappings');
-  $config->setData($mappings);
-  $config->save();
-}
-
-/**
  * Implements hook_form_FORM_ID_alter for system_regional_settings().
  *
  * @see language_system_regional_settings_form_submit()
diff --git a/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php b/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
index aa8fbea..64f1993 100644
--- a/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
+++ b/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
@@ -60,20 +60,17 @@ public function buildForm(array $form, FormStateInterface $form_state, $browser_
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $mappings = language_get_browser_drupal_langcode_mappings();
+    $this->config('language.mappings')
+      ->clear($this->browserLangcode)
+      ->save();
 
-    if (array_key_exists($this->browserLangcode, $mappings)) {
-      unset($mappings[$this->browserLangcode]);
-      language_set_browser_drupal_langcode_mappings($mappings);
+    $args = array(
+      '%browser' => $this->browserLangcode,
+    );
 
-      $args = array(
-        '%browser' => $this->browserLangcode,
-      );
+    $this->logger('language')->notice('The browser language detection mapping for the %browser browser language code has been deleted.', $args);
 
-      $this->logger('language')->notice('The browser language detection mapping for the %browser browser language code has been deleted.', $args);
-
-      drupal_set_message($this->t('The mapping for the %browser browser language code has been deleted.', $args));
-    }
+    drupal_set_message($this->t('The mapping for the %browser browser language code has been deleted.', $args));
 
     $form_state->setRedirect('language.negotiation_browser');
   }