diff --git a/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php b/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php
index 70f0e87..b664c65 100644
--- a/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php
+++ b/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php
@@ -118,7 +118,7 @@ protected function isFirstTimeModeration(EntityInterface $entity) {
     $original_entity = $this->moderationInformation->getLatestRevision($entity->getEntityTypeId(), $entity->id());
 
     if ($original_entity) {
-      $original_id = $original_entity->moderation_state->target_id;
+      $original_id = $original_entity->moderation_state;
     }
 
     return !($entity->moderation_state && $original_entity && $original_id);
diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_grants/content_moderation_test_grants.info.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_grants/content_moderation_test_grants.info.yml
deleted file mode 100644
index 825c861..0000000
--- a/core/modules/content_moderation/tests/modules/content_moderation_test_grants/content_moderation_test_grants.info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: 'Content moderation test grants'
-type: module
-description: 'Implements hook_node_grants() for testing.'
-package: Testing
-version: VERSION
-core: 8.x
-dependencies:
-  - node
diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_grants/content_moderation_test_grants.module b/core/modules/content_moderation/tests/modules/content_moderation_test_grants/content_moderation_test_grants.module
deleted file mode 100644
index 1b71c19..0000000
--- a/core/modules/content_moderation/tests/modules/content_moderation_test_grants/content_moderation_test_grants.module
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains content_moderation_test_grants.module.
- */
-
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Implements hook_node_grants().
- */
-function content_moderation_test_grants_node_grants(AccountInterface $account, $op) {
-  return [];
-}
diff --git a/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
index 156e26a..f3c2714 100644
--- a/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
@@ -19,7 +19,7 @@ class NodeAccessTest extends ModerationStateTestBase {
     'block',
     'block_content',
     'node',
-    'content_moderation_test_grants',
+    'node_access_test_empty',
   ];
 
   /**
@@ -37,7 +37,7 @@ class NodeAccessTest extends ModerationStateTestBase {
     'access content overview',
     'use editorial transition create_new_draft',
     'use editorial transition publish',
-    'bypass node access'
+    'bypass node access',
   ];
 
   /**
@@ -49,7 +49,8 @@ protected function setUp() {
     $this->createContentTypeFromUi('Moderated content', 'moderated_content', TRUE);
     $this->grantUserPermissionToCreateContentOfType($this->adminUser, 'moderated_content');
 
-    // Rebuild permissions because hook_node_grants() implemented.
+    // Rebuild permissions because hook_node_grants() is implemented by the
+    // node_access_test_empty module.
     node_access_rebuild();
   }
 
@@ -75,7 +76,6 @@ public function testPageAccess() {
     // Now make a new user and verify that the new user's access is correct.
     $user = $this->createUser([
       'use editorial transition create_new_draft',
-      'use editorial transition publish',
       'view latest version',
       'view any unpublished content',
     ]);