diff --git a/core/modules/datetime/src/Tests/NodeAuthoredDateTest.php b/core/modules/datetime/src/Tests/NodeAuthoredDateTest.php
index 5469f59..c4cec00 100644
--- a/core/modules/datetime/src/Tests/NodeAuthoredDateTest.php
+++ b/core/modules/datetime/src/Tests/NodeAuthoredDateTest.php
@@ -61,8 +61,8 @@ public function testAuthoredDate() {
     $edit = array();
     $edit['title[0][value]'] = $this->randomName(8);
     $edit['body[0][value]'] = $this->randomName(16);
-    $edit['date[date]'] = date('Y-m-d', $date);
-    $edit['date[time]'] = date('H:i:s', $date);
+    $edit['created[date]'] = date('Y-m-d', $date);
+    $edit['created[time]'] = date('H:i:s', $date);
     $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
 
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
@@ -73,8 +73,8 @@ public function testAuthoredDate() {
     $edit = array();
     $edit['title[0][value]'] = $this->randomName(8);
     $edit['body[0][value]'] = $this->randomName(16);
-    $edit['date[date]'] = date('Y-m-d', $date);
-    $edit['date[time]'] = date('H:i:s', $date);
+    $edit['created[date]'] = date('Y-m-d', $date);
+    $edit['created[time]'] = date('H:i:s', $date);
     $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
 
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
@@ -84,8 +84,8 @@ public function testAuthoredDate() {
     $edit = array();
     $edit['title[0][value]'] = $this->randomName(8);
     $edit['body[0][value]'] = $this->randomName(16);
-    $edit['date[date]'] = '2013-13-13';
-    $edit['date[time]'] = '13:13:13';
+    $edit['created[date]'] = '2013-13-13';
+    $edit['created[time]'] = '13:13:13';
     $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
     $this->assertText(t('The Authored on date is invalid.'));
     $this->assertFalse($this->drupalGetNodeByTitle($edit['title[0][value]']));
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index abf3970..b0b9bb4 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -417,7 +417,7 @@ public function buildEntity(array $form, array &$form_state) {
       $entity->setOwnerId(0);
     }
 
-    if (!empty($form_state['values']['created']) && $form_state['values']['created'] instanceOf DrupalDateTime) {
+    if (!empty($form_state['values']['created'])) {
       $date = $form_state['values']['created'];
       if (!$date instanceof DrupalDateTime) {
         if (is_array($date)) {
@@ -430,9 +430,6 @@ public function buildEntity(array $form, array &$form_state) {
         $entity->setCreatedTime($date->getTimestamp());
       }
     }
-    else {
-      $entity->setCreatedTime(REQUEST_TIME);
-    }
     return $entity;
   }
 
diff --git a/core/modules/node/src/Tests/NodeCreationTest.php b/core/modules/node/src/Tests/NodeCreationTest.php
index f1e508f..26f8147 100644
--- a/core/modules/node/src/Tests/NodeCreationTest.php
+++ b/core/modules/node/src/Tests/NodeCreationTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Language\Language;
+use Drupal\node\Entity\NodeType;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -134,7 +135,9 @@ function testUnpublishedNodeCreation() {
     \Drupal::config('system.site')->set('page.front', 'test-page')->save();
 
     // Set "Basic page" content type to be unpublished by default.
-    \Drupal::config('node.type.page')->set('settings.node.options', array())->save();
+    $type = NodeType::load('page');
+    $type->settings['node']['options']['status'] = FALSE;
+    $type->save();
 
     // Create a node.
     $edit = array();
@@ -171,7 +174,7 @@ function testAuthoredDate() {
     $edit = array();
     $edit['title[0][value]'] = $this->randomName(8);
     $edit['body[0][value]'] = $this->randomName(16);
-    $edit['date'] = date('Y-m-d H:i:s O', $date);
+    $edit['created'] = date('Y-m-d H:i:s O', $date);
     $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
 
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
@@ -182,7 +185,7 @@ function testAuthoredDate() {
     $edit = array();
     $edit['title[0][value]'] = $this->randomName(8);
     $edit['body[0][value]'] = $this->randomName(16);
-    $edit['date'] = date('Y-m-d H:i:s O', $date);
+    $edit['created'] = date('Y-m-d H:i:s O', $date);
     $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
 
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
@@ -192,7 +195,7 @@ function testAuthoredDate() {
     $edit = array();
     $edit['title[0][value]'] = $this->randomName(8);
     $edit['body[0][value]'] = $this->randomName(16);
-    $edit['date'] = '2013-13-13 13:13:13 +13:00';
+    $edit['created'] = '2013-13-13 13:13:13 +13:00';
     $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
     $this->assertText(t('You have to specify a valid date.'));
     $this->assertFalse($this->drupalGetNodeByTitle($edit['title[0][value]']));