diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
index 74160d9..cc03735 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
@@ -327,7 +327,8 @@ protected function attachPropertyData(array &$entities, $revision_id = FALSE) {
             // Currently it's guessing, and guessing is evil!
             $object = $translatable ? $translation : $entities[$id];
             $property_definition = $object->{$name}->getPropertyDefinitions();
-            $object->{$name}->{key($property_definition)} = $values[$name];
+            // Avoid going through __get() and __set() to make this faster.
+            $object->get($name)->offsetGet(0)->set(key($property_definition), $values[$name]);
           }
           // Avoid initializing configurable fields before loading them.
           elseif (!empty($definition['configurable'])) {
diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
index 854a0d9..dbea61b 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -423,7 +423,7 @@ function node_views_data() {
   // Define the base group of this table. Fields that don't have a group defined
   // will go into this field by default.
   $data['node_field_revision']['table']['group']  = t('Content revision');
-  $data['node_field_revision']['table']['wizard_id'] = 'node_field_revision';
+  $data['node_field_revision']['table']['wizard_id'] = 'node_revision';
 
 
   // Advertise this table as a possible base table.
@@ -531,7 +531,7 @@ function node_views_data() {
     'help' => t('The content title.'),
     'field' => array(
       'field' => 'title',
-      'id' => 'node_field_revision',
+      'id' => 'node_revision',
      ),
     'sort' => array(
       'id' => 'standard',