diff --git a/modules/node/node.routing.yml b/modules/node/node.routing.yml
index d592bd1a1b..e7c2e367d6 100644
--- a/modules/node/node.routing.yml
+++ b/modules/node/node.routing.yml
@@ -68,6 +68,12 @@ entity.node.revision:
   requirements:
     _access_node_revision: 'view'
     node: \d+
+  options:
+    parameters:
+      node:
+        type: entity:node
+      node_revision:
+        type: entity_revision:node
 
 node.revision_revert_confirm:
   path: '/node/{node}/revisions/{node_revision}/revert'
@@ -79,6 +85,11 @@ node.revision_revert_confirm:
     node: \d+
   options:
     _node_operation_route: TRUE
+    parameters:
+      node:
+        type: entity:node
+      node_revision:
+        type: entity_revision:node
 
 node.revision_revert_translation_confirm:
   path: '/node/{node}/revisions/{node_revision}/revert/{langcode}'
@@ -90,6 +101,11 @@ node.revision_revert_translation_confirm:
     node: \d+
   options:
     _node_operation_route: TRUE
+    parameters:
+      node:
+        type: entity:node
+      node_revision:
+        type: entity_revision:node
 
 node.revision_delete_confirm:
   path: '/node/{node}/revisions/{node_revision}/delete'
@@ -101,6 +117,11 @@ node.revision_delete_confirm:
     node: \d+
   options:
     _node_operation_route: TRUE
+    parameters:
+      node:
+        type: entity:node
+      node_revision:
+        type: entity_revision:node
 
 entity.node_type.collection:
   path: '/admin/structure/types'
diff --git a/modules/node/src/Controller/NodeController.php b/modules/node/src/Controller/NodeController.php
index 704bf51f88..faf76dd8ad 100644
--- a/modules/node/src/Controller/NodeController.php
+++ b/modules/node/src/Controller/NodeController.php
@@ -118,15 +118,14 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
   /**
    * Displays a node revision.
    *
-   * @param int $node_revision
-   *   The node revision ID.
+   * @param \Drupal\node\NodeInterface $node_revision
+   *   The node object for a specific revision.
    *
    * @return array
    *   An array suitable for \Drupal\Core\Render\RendererInterface::render().
    */
   public function revisionShow($node_revision) {
-    $node = $this->entityManager()->getStorage('node')->loadRevision($node_revision);
-    $node = $this->entityManager()->getTranslationFromContext($node);
+    $node = $this->entityManager()->getTranslationFromContext($node_revision);
     $node_view_controller = new NodeViewController($this->entityManager, $this->renderer, $this->currentUser());
     $page = $node_view_controller->view($node);
     unset($page['nodes'][$node->id()]['#cache']);
diff --git a/modules/node/tests/modules/node_routes_test/node_routes_test.info.yml b/modules/node/tests/modules/node_routes_test/node_routes_test.info.yml
new file mode 100644
index 0000000000..8d33b573d0
--- /dev/null
+++ b/modules/node/tests/modules/node_routes_test/node_routes_test.info.yml
@@ -0,0 +1,7 @@
+type: module
+core: 8.x
+name: 'Node routes test'
+description: 'Module for testing routes.'
+package: Testing
+dependecies:
+  - node
diff --git a/modules/node/tests/modules/node_routes_test/src/Plugin/Block/NodeRoutesTestBlock.php b/modules/node/tests/modules/node_routes_test/src/Plugin/Block/NodeRoutesTestBlock.php
new file mode 100644
index 0000000000..6944c041c1
--- /dev/null
+++ b/modules/node/tests/modules/node_routes_test/src/Plugin/Block/NodeRoutesTestBlock.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Drupal\node_routes_test\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a testing block for node routes.
+ *
+ * @Block(
+ *  id = "node_routes_test_block",
+ *  admin_label = @Translation("Node routes test block")
+ * )
+ */
+class NodeRoutesTestBlock extends BlockBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The current route match.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * Creates a NodeRoutesTestBlock instance.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The current route match.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->routeMatch = $route_match;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('current_route_match')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    $is_article_page = FALSE;
+    if ($node = $this->routeMatch->getParameter('node')) {
+      $is_article_page = $node->getType() == 'article';
+    }
+    $markup = $is_article_page ? 'article page' : 'not an article page';
+    return [
+      [
+        '#markup' => $markup,
+        '#cache' => ['max-age' => 0],
+      ],
+    ];
+  }
+
+}
diff --git a/modules/node/tests/src/Functional/NodeRoutesTest.php b/modules/node/tests/src/Functional/NodeRoutesTest.php
new file mode 100644
index 0000000000..eb9a5ae5af
--- /dev/null
+++ b/modules/node/tests/src/Functional/NodeRoutesTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\Tests\node\Functional;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\node\Entity\Node;
+
+/**
+ * Provides tests for node routes.
+ *
+ * @group node
+ */
+class NodeRoutesTest extends NodeTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'block',
+    'content_translation',
+    'language',
+    'node_routes_test',
+  ];
+
+  /**
+   * Tests up-casting for revision routes.
+   */
+  public function testRevisionRoutes() {
+    ConfigurableLanguage::createFromLangcode('it')->save();
+
+    $this->placeBlock('node_routes_test_block');
+
+    $account = $this->drupalCreateUser([
+      'view article revisions',
+      'revert article revisions',
+      'delete article revisions',
+      'edit any article content',
+      'delete any article content',
+      'translate any entity',
+    ]);
+    $this->drupalLogin($account);
+
+    $node = Node::create([
+      'type' => 'article',
+      'title' => 'Foo',
+      'status' => Node::PUBLISHED,
+    ]);
+    $node->save();
+    $nid = $node->id();
+    $initial_rid = $node->getRevisionId();
+
+    $node->setTitle('Bar');
+    $node->setNewRevision(TRUE);
+    $node->save();
+    $current_rid = $node->getRevisionId();
+
+    $paths = [
+      "node/$nid/revisions",
+      "node/$nid/revisions/$current_rid/view",
+      "node/$nid/revisions/$initial_rid/revert",
+      "node/$nid/revisions/$initial_rid/revert/it",
+      "node/$nid/revisions/$initial_rid/delete",
+    ];
+
+    foreach ($paths as $path) {
+      $this->drupalGet($path);
+    }
+  }
+
+}