diff --git a/src/applications/audit/storage/PhabricatorAuditInlineComment.php b/src/applications/audit/storage/PhabricatorAuditInlineComment.php
--- a/src/applications/audit/storage/PhabricatorAuditInlineComment.php
+++ b/src/applications/audit/storage/PhabricatorAuditInlineComment.php
@@ -55,27 +55,6 @@
     return head(self::buildProxies($inlines));
   }
 
-  public static function loadDraftComments(
-    PhabricatorUser $viewer,
-    $commit_phid,
-    $raw = false) {
-
-    $inlines = id(new DiffusionDiffInlineCommentQuery())
-      ->setViewer($viewer)
-      ->withAuthorPHIDs(array($viewer->getPHID()))
-      ->withCommitPHIDs(array($commit_phid))
-      ->withHasTransaction(false)
-      ->withIsDeleted(false)
-      ->needReplyToComments(true)
-      ->execute();
-
-    if ($raw) {
-      return $inlines;
-    }
-
-    return self::buildProxies($inlines);
-  }
-
   public static function loadPublishedComments(
     PhabricatorUser $viewer,
     $commit_phid) {
diff --git a/src/applications/diffusion/editor/DiffusionCommitEditEngine.php b/src/applications/diffusion/editor/DiffusionCommitEditEngine.php
--- a/src/applications/diffusion/editor/DiffusionCommitEditEngine.php
+++ b/src/applications/diffusion/editor/DiffusionCommitEditEngine.php
@@ -128,10 +128,12 @@
     $viewer = $this->getViewer();
     $xactions = array();
 
-    $inlines = PhabricatorAuditInlineComment::loadDraftComments(
-      $viewer,
-      $object->getPHID(),
-      $raw = true);
+    $inlines = id(new DiffusionDiffInlineCommentQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object->getPHID()))
+      ->withPublishableComments(true)
+      ->needReplyToComments(true)
+      ->execute();
     $inlines = msort($inlines, 'getID');
 
     $editor = $object->getApplicationTransactionEditor()
diff --git a/src/applications/diffusion/engine/DiffusionCommitDraftEngine.php b/src/applications/diffusion/engine/DiffusionCommitDraftEngine.php
--- a/src/applications/diffusion/engine/DiffusionCommitDraftEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitDraftEngine.php
@@ -7,10 +7,11 @@
     $viewer = $this->getViewer();
     $commit = $this->getObject();
 
-    $inlines = PhabricatorAuditInlineComment::loadDraftComments(
-      $viewer,
-      $commit->getPHID(),
-      $raw = true);
+    $inlines = id(new DiffusionDiffInlineCommentQuery())
+      ->setViewer($viewer)
+      ->withCommitPHIDs(array($commit->getPHID()))
+      ->withPublishableComments(true)
+      ->execute();
 
     return (bool)$inlines;
   }