diff -u b/core/modules/node/node.install b/core/modules/node/node.install
--- b/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -225,13 +225,15 @@
  */
 function node_update_8004() {
   $query = \Drupal::entityQuery('entity_form_display')
-    ->condition('targetEntityType', 'node');
+    ->condition('targetEntityType', 'node')
+    ->condition('mode', 'default');
   $ids = $query->execute();
   $form_displays = EntityFormDisplay::loadMultiple($ids);
 
+  // Assign status settings for each 'node' target entity types with 'default'
+  // form mode.
   foreach ($form_displays as $nid => $node) {
-    // Assign status settings for the 'default' form mode.
-    $form_displays
+    $node
       ->setComponent('status', array(
         'type' => 'boolean_checkbox',
         'settings' => array(
only in patch2:
unchanged:
--- a/core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php
+++ b/core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php
@@ -72,7 +72,7 @@ function testDisplayRevisionTab() {
 
     // Uncheck the create new revision checkbox and save the node.
     $edit = array('revision' => FALSE);
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
+    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save');
 
     $this->assertUrl($node->toUrl());
     $this->assertNoLink(t('Revisions'));
@@ -83,7 +83,7 @@ function testDisplayRevisionTab() {
 
     // Submit the form without changing the checkbox.
     $edit = array();
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
+    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save');
 
     $this->assertUrl($node->toUrl());
     $this->assertLink(t('Revisions'));