diff --git a/src/PathautoState.php b/src/PathautoState.php
index 16b8a26..6a151c3 100644
--- a/src/PathautoState.php
+++ b/src/PathautoState.php
@@ -51,22 +51,12 @@ class PathautoState extends TypedData {
       // entity has already been saved.
       $this->value = \Drupal::keyValue($this->getCollection())
         ->get($this->parent->getEntity()->id());
-      // If it was not yet saved or no value was found, try to detect based on
-      // an existing alias if the entity is not new.
+
       if ($this->value === NULL) {
-        $entity_path = '/' . $entity->toUrl()->getInternalPath();
-        $path = \Drupal::service('path.alias_manager')
-          ->getAliasByPath(
-            $entity_path, $entity->language()->getId()
-          );
-        $pathauto_alias = \Drupal::service('pathauto.generator')
-          ->createEntityAlias($entity, 'return');
-        if (($path != $entity_path && $path == $pathauto_alias)) {
-          $this->value = static::CREATE;
-        }
-        else {
-          $this->value = static::SKIP;
-        }
+        $this->value = static::CREATE;
+      }
+      else {
+        $this->value = static::SKIP;
       }
     }
     return $this->value;
diff --git a/src/Tests/PathautoBulkUpdateTest.php b/src/Tests/PathautoBulkUpdateTest.php
index 149ae9b..273128f 100644
--- a/src/Tests/PathautoBulkUpdateTest.php
+++ b/src/Tests/PathautoBulkUpdateTest.php
@@ -97,4 +97,28 @@ class PathautoBulkUpdateTest extends WebTestBase {
 
     $this->assertNoEntityAliasExists($new_node);
   }
+
+  /**
+   * Tests alias generation for nodes that existed before installing Pathauto.
+   */
+  function testBulkUpdateExistingContent() {
+    // Create a node.
+    $node = $this->drupalCreateNode();
+
+    // Delete its alias and Pathauto metadata.
+    \Drupal::service('pathauto.alias_storage_helper')->deleteEntityPathAll($node);
+    $node->path->first()->get('pathauto')->purge();
+    \Drupal::entityManager()->getStorage('node')->resetCache(array($node->id()));
+
+    // Execute bulk generation.
+    // Bulk create aliases.
+    $edit = array(
+      'update[canonical_entities:node]' => TRUE,
+    );
+    $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
+
+    // Verify that the alias was created for the node.
+    $this->assertText('Generated 1 URL alias.');
+  }
+
 }