diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index ca51bb8..d540cad 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -1865,7 +1865,7 @@ class LocaleContentFunctionalTest extends WebTestBase {
     $edit = array(
       'type' => 'page',
       'title' => $node_title,
-      'body' => array(LANGUAGE_NOT_SPECIFIED => array(array('value' => $node_body))),
+      'body' => array($langcode => array(array('value' => $node_body))),
       'langcode' => $langcode,
     );
     $node = $this->drupalCreateNode($edit);
@@ -1957,7 +1957,7 @@ class LocaleContentFunctionalTest extends WebTestBase {
     $edit = array(
       'type' => 'article',
       'title' => $node_title,
-      'body' => array(LANGUAGE_NOT_SPECIFIED => array(array('value' => $node_body))),
+      'body' => array($langcode => array(array('value' => $node_body))),
       'langcode' => $langcode,
       'promote' => 1,
     );
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 4369f19..8cb1d22 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -198,15 +198,12 @@ function node_form($form, &$form_state, Node $node) {
       '#default_value' => (isset($node->langcode) ? $node->langcode : ''),
       '#options' => $language_options,
       '#empty_value' => LANGUAGE_NOT_SPECIFIED,
-      '#disabled' => variable_get('node_type_language_locked_' . $node->type, TRUE),
     );
   }
   else {
     $form['langcode'] = array(
       '#type' => 'value',
-      // New nodes without multilingual support get the default language of the
-      // content type (for new nodes already set in node_add), old nodes keep
-      // their language if language.module is not available.
+      // Use default language when language module is inactive.
       '#value' => $node->langcode,
     );
   }
diff --git a/core/modules/system/tests/upgrade/upgrade.language.test b/core/modules/system/tests/upgrade/upgrade.language.test
index c92380c..1327d2f 100644
--- a/core/modules/system/tests/upgrade/upgrade.language.test
+++ b/core/modules/system/tests/upgrade/upgrade.language.test
@@ -75,9 +75,9 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase {
 
     // Check for node content type settings upgrade.
     $this->drupalGet('node/add/article');
-    $this->assertFieldByName('langcode');
+    $this->assertNoFieldByName('langcode');
     $this->drupalGet('node/add/page');
-    $this->assertFieldByName('langcode');
+    $this->assertNoFieldByName('langcode');
 
     // Check that the user language value was retained in both langcode and
     // preferred_langcode.