diff --git a/core/modules/node/node.info.yml b/core/modules/node/node.info.yml
index e61b363..ab8e3c3 100644
--- a/core/modules/node/node.info.yml
+++ b/core/modules/node/node.info.yml
@@ -7,3 +7,4 @@ core: 8.x
 configure: node.overview_types
 dependencies:
   - text
+  - entity_reference
diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index a3986ab..9041aea 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -377,6 +377,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setSettings(array(
         'target_type' => 'user',
         'default_value' => 0,
+        'handler' => 'default',
       ))
       ->setTranslatable(TRUE)
       ->setDisplayOptions('view', array(
@@ -385,10 +386,13 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
         'weight' => 0,
       ))
       ->setDisplayOptions('form', array(
-        'type' => 'author_autocomplete',
+        'type' => 'entity_reference_autocomplete',
         'weight' => -1,
         'settings' => array(
-          'route_name' => 'user.autocomplete',
+          'match_operator' => 'CONTAINS',
+          'size' => '60',
+          'autocomplete_type' => 'tags',
+          'placeholder' => '',
         ),
       ));
 
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 85b5de0..4cf9c9f 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -7,13 +7,8 @@
 
 namespace Drupal\node;
 
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Component\Utility\String;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Language\Language;
 
 /**
  * Form controller for the node edit forms.
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index 3e0d032..7ab0b5e 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -84,7 +84,7 @@
       <div class="node__meta">
         {{ author_picture }}
         <span{{ author_attributes }}>
-          {% trans %}Submitted by {{ author_name|passthrough }} on {{ date }}{% endtrans %}
+          {% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %}
         </span>
         {{ metadata }}
       </div>