node_user_predelete.patch

diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 470ddfc..086fd95 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -707,18 +707,21 @@ function node_user_cancel($edit, $account, $method) {
  * Implements hook_ENTITY_TYPE_predelete() for user entities.
  */
 function node_user_predelete($account) {
-  // Delete nodes (current revisions).
-  // @todo Introduce node_mass_delete() or make node_mass_update() more flexible.
-  $nids = \Drupal::entityQuery('node')
-    ->condition('uid', $account->id())
-    ->execute();
-  entity_delete_multiple('node', $nids);
   // Delete old revisions.
   $storage_controller = \Drupal::entityManager()->getStorage('node');
   $revisions = $storage_controller->userRevisionIds($account);
   foreach ($revisions as $revision) {
-    node_revision_delete($revision);
+    $node = entity_revision_load('node', $revision);
+    if (!$node->isDefaultRevision()) {
+      node_revision_delete($revision);
+    }
   }
+  // Delete nodes (current revisions).
+  // @todo Introduce node_mass_delete() or make node_mass_update() more flexible.
+  $nodes = $storage_controller->loadByProperties([
+    'uid' => $account->id()
+  ]);
+  $storage_controller->delete($nodes);
 }
 
 /**

My Behat tests are failing with "Default revision can not be deleted (Drupal\Core\Entity\EntityStorageException)".

This patch fixes it, but I'm not yet sure whether this is the correct approach.