diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php
index db3a7b4..0d2961c 100644
--- a/core/modules/node/src/NodeViewBuilder.php
+++ b/core/modules/node/src/NodeViewBuilder.php
@@ -151,10 +151,20 @@ protected function alterBuild(array &$build, EntityInterface $entity, EntityView
     /** @var \Drupal\node\NodeInterface $entity */
     parent::alterBuild($build, $entity, $display, $view_mode);
     if ($entity->id()) {
-      $build['#contextual_links']['node'] = array(
-        'route_parameters' =>array('node' => $entity->id()),
-        'metadata' => array('changed' => $entity->getChangedTime()),
-      );
+      if ($entity->isDefaultRevision()) {
+        $build['#contextual_links']['node'] = array(
+          'route_parameters' => array('node' => $entity->id()),
+          'metadata' => array('changed' => $entity->getChangedTime()),
+        );
+      }
+      else {
+        $build['#contextual_links']['node_revision'] = array(
+          'route_parameters' => array(
+            'node' => $entity->id(),
+            'node_revision' => $entity->getRevisionId(),
+          ),
+        );
+      }
     }
   }
 
diff --git a/core/modules/node/src/Tests/NodeRevisionsTest.php b/core/modules/node/src/Tests/NodeRevisionsTest.php
index 45fa06d..1762aee 100644
--- a/core/modules/node/src/Tests/NodeRevisionsTest.php
+++ b/core/modules/node/src/Tests/NodeRevisionsTest.php
@@ -13,6 +13,7 @@
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
+use Drupal\Component\Serialization\Json;
 
 /**
  * Create a node with revisions and test viewing, saving, reverting, and
@@ -39,7 +40,7 @@ class NodeRevisionsTest extends NodeTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('node', 'datetime', 'language', 'content_translation');
+  public static $modules = array('node', 'contextual', 'datetime', 'language', 'content_translation');
 
   /**
    * {@inheritdoc}
@@ -74,6 +75,7 @@ protected function setUp() {
         'delete page revisions',
         'edit any page content',
         'delete any page content',
+        'access contextual links',
         'translate any entity',
       )
     );
@@ -154,6 +156,17 @@ function testRevisions() {
     // Confirm that this is the default revision.
     $this->assertTrue($node->isDefaultRevision(), 'Third node revision is the default one.');
 
+    // Confirm that the "Edit" and "Delete" contextual links appear for the
+    // default revision.
+    $ids = array('node:node=' . $node->id() . ':changed=' . $node->getChangedTime());
+    $json = $this->renderContextualLinks($ids, "node/" . $node->id());
+    $this->verbose($json[$ids[0]]);
+
+    $expected = '<li class="entitynodeedit-form"><a href="' . base_path() . 'node/' . $node->id() . '/edit">Edit</a></li>';
+    $this->assertTrue(strstr($json[$ids[0]], $expected), 'The "Edit" contextual link is shown for the default revision.');
+    $expected = '<li class="entitynodedelete-form"><a href="' . base_path() . 'node/' . $node->id() . '/delete">Delete</a></li>';
+    $this->assertTrue(strstr($json[$ids[0]], $expected), 'The "Delete" contextual link is shown for the default revision.');
+
     // Confirm that revisions revert properly.
     $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionid() . "/revert", array(), t('Revert'));
     $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.',
@@ -167,6 +180,17 @@ function testRevisions() {
     $node = node_revision_load($node->getRevisionId());
     $this->assertFalse($node->isDefaultRevision(), 'Third node revision is not the default one.');
 
+    // Confirm that "Edit" and "Delete" contextual links don't appear for
+    // non-default revision.
+    $ids = array('node_revision::node=' . $node->id() . '&node_revision=' . $node->getRevisionId() . ':');
+    $json = $this->renderContextualLinks($ids, "node/" . $node->id() . '/revisions/' . $node->getRevisionId() . '/view');
+    $this->verbose($json[$ids[0]]);
+
+    $this->assertFalse(strstr($json[$ids[0]], '<li class="entitynodeedit-form">'),
+      'The "Edit" contextual link is not shown for a non-default revision.');
+    $this->assertFalse(strstr($json[$ids[0]], '<li class="entitynodedelete-form">'),
+      'The "Delete" contextual link is not shown for a non-default revision.');
+
     // Confirm revisions delete properly.
     $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", array(), t('Delete'));
     $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.',
@@ -266,6 +290,27 @@ function testNodeRevisionWithoutLogMessage() {
   }
 
   /**
+   * Get server-rendered contextual links for the given contextual links ids.
+   *
+   * @param array $ids
+   *   An array of contextual link ids.
+   * @param string $current_path
+   *   The Drupal path for the page for which the contextual links are rendered.
+   *
+   * @return string
+   *   The decoded Json response body.
+   */
+  protected function renderContextualLinks($ids, $current_path) {
+    $post = array();
+    for ($i = 0; $i < count($ids); $i++) {
+      $post['ids[' . $i . ']'] = $ids[$i];
+    }
+    $response = $this->drupalPost('contextual/render', 'application/json', $post, array('query' => array('destination' => $current_path)));
+
+    return Json::decode($response);
+  }
+
+  /**
    * Tests the revision translations are correctly reverted.
    */
   public function testRevisionTranslationRevert() {