diff --git a/src/Entity/Storage/ContentEntityStorageTrait.php b/src/Entity/Storage/ContentEntityStorageTrait.php
index 0440502..3e9c9cf 100644
--- a/src/Entity/Storage/ContentEntityStorageTrait.php
+++ b/src/Entity/Storage/ContentEntityStorageTrait.php
@@ -302,7 +302,7 @@ trait ContentEntityStorageTrait {
   /**
    * {@inheritdoc}
    */
-  public function delete(array $entities) {
+  protected function doDelete($entities) {
     // Entities are always "deleted" as new revisions when using a Multiversion
     // storage handler.
     $ids = [];
diff --git a/src/Entity/Storage/Sql/CommentStorage.php b/src/Entity/Storage/Sql/CommentStorage.php
index fbd3335..f8cef28 100644
--- a/src/Entity/Storage/Sql/CommentStorage.php
+++ b/src/Entity/Storage/Sql/CommentStorage.php
@@ -17,13 +17,13 @@ use Drupal\comment\CommentStorage as CoreCommentStorage;
 class CommentStorage extends CoreCommentStorage implements ContentEntityStorageInterface {
 
   use ContentEntityStorageTrait {
-    delete as deleteEntities;
+    doDelete as deleteEntities;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function delete(array $entities) {
+  public function doDelete($entities) {
     // Ensure that the entities are keyed by ID.
     $keyed_entities = [];
     foreach ($entities as $entity) {
diff --git a/src/Entity/Storage/Sql/MenuLinkContentStorage.php b/src/Entity/Storage/Sql/MenuLinkContentStorage.php
index ae57be8..8608801 100644
--- a/src/Entity/Storage/Sql/MenuLinkContentStorage.php
+++ b/src/Entity/Storage/Sql/MenuLinkContentStorage.php
@@ -17,8 +17,8 @@ class MenuLinkContentStorage extends ContentEntityStorage implements ContentEnti
   /**
    * {@inheritdoc}
    */
-  public function delete(array $entities) {
-    parent::delete($entities);
+  protected function doDelete($entities) {
+    parent::doDelete($entities);
 
     /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
     $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
diff --git a/src/Entity/Storage/Sql/NodeStorage.php b/src/Entity/Storage/Sql/NodeStorage.php
index 906d276..8b8c575 100644
--- a/src/Entity/Storage/Sql/NodeStorage.php
+++ b/src/Entity/Storage/Sql/NodeStorage.php
@@ -16,32 +16,6 @@ use Drupal\node\NodeStorage as CoreNodeStorage;
  */
 class NodeStorage extends CoreNodeStorage implements ContentEntityStorageInterface {
 
-  use ContentEntityStorageTrait {
-    delete as deleteEntities;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @todo: {@link https://www.drupal.org/node/2597534 Figure out why we need
-   * this}, core seems to solve it some other way.
-   */
-  public function delete(array $entities) {
-    // Delete all comments before deleting the nodes.
-    try {
-      $comment_storage = \Drupal::entityManager()->getStorage('comment');
-      foreach ($entities as $entity) {
-        if ($entity->comment) {
-          $comments = $comment_storage->loadThread($entity, 'comment', 1);
-          $comment_storage->delete($comments);
-        }
-      }
-    }
-    catch (\Exception $e) {
-      // Failing likely due to comment module not being enabled. But we also
-      // don't want node delete to fail because of broken comments.
-    }
-    $this->deleteEntities($entities);
-  }
+  use ContentEntityStorageTrait;
 
 }
diff --git a/src/Entity/Storage/Sql/TermStorage.php b/src/Entity/Storage/Sql/TermStorage.php
index e647002..b467b18 100644
--- a/src/Entity/Storage/Sql/TermStorage.php
+++ b/src/Entity/Storage/Sql/TermStorage.php
@@ -17,7 +17,7 @@ use Drupal\taxonomy\TermStorage as CoreTermStorage;
 class TermStorage extends CoreTermStorage implements ContentEntityStorageInterface {
 
   use ContentEntityStorageTrait {
-    delete as deleteEntities;
+    doDelete as deleteEntities;
   }
 
   /**
@@ -127,7 +127,7 @@ class TermStorage extends CoreTermStorage implements ContentEntityStorageInterfa
   /**
    * {@inheritdoc}
    */
-  public function delete(array $entities) {
+  public function doDelete($entities) {
     $this->deleteEntities($entities);
     foreach ($entities as $entity) {
       $this->updateParentHierarchy(array($entity->id()));