diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 8dbc060edbdf8f71d996aa13b1bc726df6f255a3..64491939e08d20b97ac20e6be7e451b3a0115586 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -687,7 +687,7 @@ function node_type_update_nodes($old_type, $type) {
  *   type object by $type->disabled being set to TRUE.
  */
 function _node_types_build($rebuild = FALSE) {
-  $cid = 'node_types:' . $GLOBALS['language_interface']->langcode;
+  $cid = 'node_types:' . drupal_container()->get(LANGUAGE_TYPE_INTERFACE)->langcode;
 
   if (!$rebuild) {
     $_node_types = &drupal_static(__FUNCTION__);
diff --git a/core/modules/node/node.test b/core/modules/node/node.test
index deccadaa3e881819d9ce595978b32f8fbcab1b4f..9188bad014217dbe3148b67fef19f9abc9ab93fb 100644
--- a/core/modules/node/node.test
+++ b/core/modules/node/node.test
@@ -2278,7 +2278,7 @@ class NodeTokenReplaceTestCase extends NodeWebTestCase {
    * Creates a node, then tests the tokens generated from it.
    */
   function testNodeTokenReplacement() {
-    global $language_interface;
+    $language_interface = drupal_container()->get(LANGUAGE_TYPE_INTERFACE);
     $url_options = array(
       'absolute' => TRUE,
       'language' => $language_interface,