diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index 4476746..21176af 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -192,24 +192,24 @@ public static function getStandardLanguageList() {
       'ar' => array('Arabic', /* Left-to-right marker "‭" */ 'العربية', Language::DIRECTION_RTL),
       'ast' => array('Asturian', 'Asturianu'),
       'az' => array('Azerbaijani', 'Azərbaycanca'),
-      'be' => array('Belarusian', 'Белару�?ка�?'),
-      'bg' => array('Bulgarian', 'Българ�?ки'),
+      'be' => array('Belarusian', 'Беларуская'),
+      'bg' => array('Bulgarian', 'Български'),
       'bn' => array('Bengali', 'বাংলা'),
-      'bo' => array('Tibetan', 'བོད་ས�?ད་'),
+      'bo' => array('Tibetan', 'བོད་སྐད་'),
       'bs' => array('Bosnian', 'Bosanski'),
       'ca' => array('Catalan', 'Català'),
       'cs' => array('Czech', 'Čeština'),
       'cy' => array('Welsh', 'Cymraeg'),
       'da' => array('Danish', 'Dansk'),
       'de' => array('German', 'Deutsch'),
-      'dz' => array('Dzongkha', 'རྫོང་�?'),
+      'dz' => array('Dzongkha', 'རྫོང་ཁ'),
       'el' => array('Greek', 'Ελληνικά'),
       'en' => array('English', 'English'),
       'eo' => array('Esperanto', 'Esperanto'),
       'es' => array('Spanish', 'Español'),
       'et' => array('Estonian', 'Eesti'),
       'eu' => array('Basque', 'Euskera'),
-      'fa' => array('Persian, Farsi', /* Left-to-right marker "‭" */ '�?ارسی', Language::DIRECTION_RTL),
+      'fa' => array('Persian, Farsi', /* Left-to-right marker "‭" */ 'فارسی', Language::DIRECTION_RTL),
       'fi' => array('Finnish', 'Suomi'),
       'fil' => array('Filipino', 'Filipino'),
       'fo' => array('Faeroese', 'Føroyskt'),
@@ -219,22 +219,22 @@ public static function getStandardLanguageList() {
       'gd' => array('Scots Gaelic', 'Gàidhlig'),
       'gl' => array('Galician', 'Galego'),
       'gsw-berne' => array('Swiss German', 'Schwyzerdütsch'),
-      'gu' => array('Gujarati', 'ગ�?જરાતી'),
+      'gu' => array('Gujarati', 'ગુજરાતી'),
       'he' => array('Hebrew', /* Left-to-right marker "‭" */ 'עברית', Language::DIRECTION_RTL),
-      'hi' => array('Hindi', 'हिन�?दी'),
+      'hi' => array('Hindi', 'हिन्दी'),
       'hr' => array('Croatian', 'Hrvatski'),
       'ht' => array('Haitian Creole', 'Kreyòl ayisyen'),
       'hu' => array('Hungarian', 'Magyar'),
       'hy' => array('Armenian', 'Հայերեն'),
       'id' => array('Indonesian', 'Bahasa Indonesia'),
-      'is' => array('Icelandic', '�?slenska'),
+      'is' => array('Icelandic', 'Íslenska'),
       'it' => array('Italian', 'Italiano'),
       'ja' => array('Japanese', '日本語'),
       'jv' => array('Javanese', 'Basa Java'),
-      'ka' => array('Georgian', 'ქ�?რთული ენ�?'),
+      'ka' => array('Georgian', 'ქართული ენა'),
       'kk' => array('Kazakh', 'Қазақ'),
-      'km' => array('Khmer', 'ភាសា�?្មែរ'),
-      'kn' => array('Kannada', 'ಕನ�?ನಡ'),
+      'km' => array('Khmer', 'ភាសាខ្មែរ'),
+      'kn' => array('Kannada', 'ಕನ್ನಡ'),
       'ko' => array('Korean', '한국어'),
       'ku' => array('Kurdish', 'Kurdî'),
       'ky' => array('Kyrgyz', 'Кыргызча'),
@@ -242,7 +242,7 @@ public static function getStandardLanguageList() {
       'lt' => array('Lithuanian', 'Lietuvių'),
       'lv' => array('Latvian', 'Latviešu'),
       'mg' => array('Malagasy', 'Malagasy'),
-      'mk' => array('Macedonian', 'Македон�?ки'),
+      'mk' => array('Macedonian', 'Македонски'),
       'ml' => array('Malayalam', 'മലയാളം'),
       'mn' => array('Mongolian', 'монгол'),
       'mr' => array('Marathi', 'मराठी'),
@@ -258,29 +258,29 @@ public static function getStandardLanguageList() {
       'pt-pt' => array('Portuguese, Portugal', 'Português, Portugal'),
       'pt-br' => array('Portuguese, Brazil', 'Português, Brasil'),
       'ro' => array('Romanian', 'Română'),
-      'ru' => array('Russian', 'Ру�?�?кий'),
+      'ru' => array('Russian', 'Русский'),
       'sco' => array('Scots', 'Scots'),
       'se' => array('Northern Sami', 'Sámi'),
       'si' => array('Sinhala', 'සිංහල'),
-      'sk' => array('Slovak', 'Sloven�?ina'),
-      'sl' => array('Slovenian', 'Slovenš�?ina'),
+      'sk' => array('Slovak', 'Slovenčina'),
+      'sl' => array('Slovenian', 'Slovenščina'),
       'sq' => array('Albanian', 'Shqip'),
-      'sr' => array('Serbian', 'Срп�?ки'),
+      'sr' => array('Serbian', 'Српски'),
       'sv' => array('Swedish', 'Svenska'),
       'sw' => array('Swahili', 'Kiswahili'),
-      'ta' => array('Tamil', 'தமிழ�?'),
-      'ta-lk' => array('Tamil, Sri Lanka', 'தமிழ�?, இலங�?கை'),
-      'te' => array('Telugu', 'తెల�?గ�?'),
+      'ta' => array('Tamil', 'தமிழ்'),
+      'ta-lk' => array('Tamil, Sri Lanka', 'தமிழ், இலங்கை'),
+      'te' => array('Telugu', 'తెలుగు'),
       'th' => array('Thai', 'ภาษาไทย'),
       'tr' => array('Turkish', 'Türkçe'),
       'tyv' => array('Tuvan', 'Тыва дыл'),
       'ug' => array('Uyghur', 'Уйғур'),
-      'uk' => array('Ukrainian', 'Україн�?ька'),
+      'uk' => array('Ukrainian', 'Українська'),
       'ur' => array('Urdu', /* Left-to-right marker "‭" */ 'اردو', Language::DIRECTION_RTL),
       'vi' => array('Vietnamese', 'Tiếng Việt'),
       'xx-lolspeak' => array('Lolspeak', 'Lolspeak'),
       'zh-hans' => array('Chinese, Simplified', '简体中文'),
-      'zh-hant' => array('Chinese, Traditional', '�?體中文'),
+      'zh-hant' => array('Chinese, Traditional', '繁體中文'),
     );
   }
 
diff --git a/core/modules/language/language.install b/core/modules/language/language.install
index 137e7c3..9f7a607 100644
--- a/core/modules/language/language.install
+++ b/core/modules/language/language.install
@@ -20,9 +20,6 @@ function language_install() {
     module_load_include('inc', 'language', 'language.negotiation');
     language_negotiation_set($type, array(LanguageNegotiationUrl::METHOD_ID => 0));
   }
-
-  // Update the language count.
-  language_update_count();
 }
 
 /**
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 36613df..1e4bc21 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -473,9 +473,6 @@ function language_save($language) {
   // Reset the language information.
   Drupal::languageManager()->reset();
 
-  // Update language count based on unlocked language count.
-  language_update_count();
-
   // Update weight of locked system languages.
   language_update_locked_weights();
 
@@ -487,22 +484,6 @@ function language_save($language) {
 }
 
 /**
- * Updates the language_count state.
- *
- * This is used to check if a site is multilingual or not.
- *
- * @see language_multilingual()
- */
-function language_update_count() {
-  $count = 0;
-  foreach (entity_load_multiple('language_entity') as $language) {
-    if (!$language->locked) {
-      $count++;
-    }
-  }
-}
-
-/**
  * Delete a language.
  *
  * @param $langcode
@@ -521,8 +502,6 @@ function language_delete($langcode) {
     // Remove the language.
     entity_delete_multiple('language_entity', array($language->id));
 
-    language_update_count();
-
     // Update weight of locked system languages.
     language_update_locked_weights();