diff --git a/core/core.services.yml b/core/core.services.yml
index b83231423810a18b65e3f13532907bf18f7c7bd9..e2939e907ef12881edb9fe831ba7631289953546 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -622,6 +622,11 @@ services:
   language_manager:
     class: Drupal\Core\Language\LanguageManager
     arguments: ['@language.default']
+  language.current_language_context:
+    class: Drupal\Core\Language\ContextProvider\CurrentLanguageContext
+    arguments: ['@language_manager']
+    tags:
+      - { name: 'context_provider' }
   language.default:
     class: Drupal\Core\Language\LanguageDefault
     arguments: ['%language.default_values%']
diff --git a/core/modules/language/src/ContextProvider/CurrentLanguageContext.php b/core/lib/Drupal/Core/Language/ContextProvider/CurrentLanguageContext.php
similarity index 94%
rename from core/modules/language/src/ContextProvider/CurrentLanguageContext.php
rename to core/lib/Drupal/Core/Language/ContextProvider/CurrentLanguageContext.php
index bf59ad2f27b458f1f3fad709d7a3f2a87ac83e73..94f39fd7797c2125fe3391f4cb0c28f30bbf1afe 100644
--- a/core/modules/language/src/ContextProvider/CurrentLanguageContext.php
+++ b/core/lib/Drupal/Core/Language/ContextProvider/CurrentLanguageContext.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\language\ContextProvider\CurrentLanguageContext.
+ * Contains \Drupal\Core\Language\ContextProvider\CurrentLanguageContext.
  */
 
-namespace Drupal\language\ContextProvider;
+namespace Drupal\Core\Language\ContextProvider;
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Language\LanguageManagerInterface;
diff --git a/core/modules/language/language.services.yml b/core/modules/language/language.services.yml
index 5a2d52c918a68ae9f945538cbaa2c673e3082579..b9de79a0b789966cd8610bb6965c2d9dc6d66a13 100644
--- a/core/modules/language/language.services.yml
+++ b/core/modules/language/language.services.yml
@@ -24,8 +24,3 @@ services:
     tags:
       - { name: paramconverter }
     lazy: true
-  language.current_language_context:
-    class: Drupal\language\ContextProvider\CurrentLanguageContext
-    arguments: ['@language_manager']
-    tags:
-      - { name: 'context_provider' }