diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 1db0302cc8..5af83f1d50 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -140,11 +140,21 @@ final class DiffusionCommitController extends DiffusionController {
 
     $content[] = $this->buildMergesTable($commit);
 
+    // TODO: This is silly, but the logic to figure out which audits are
+    // highlighted currently lives in PhabricatorAuditListView. Refactor this
+    // to be less goofy.
+    $highlighted_audits = id(new PhabricatorAuditListView())
+      ->setAudits($audit_requests)
+      ->setAuthorityPHIDs($this->auditAuthorityPHIDs)
+      ->setUser($user)
+      ->setCommits(array($commit->getPHID() => $commit))
+      ->getHighlightedAudits();
+
     $owners_paths = array();
-    if ($this->highlightedAudits) {
+    if ($highlighted_audits) {
       $packages = id(new PhabricatorOwnersPackage())->loadAllWhere(
         'phid IN (%Ls)',
-        mpull($this->highlightedAudits, 'getAuditorPHID'));
+        mpull($highlighted_audits, 'getAuditorPHID'));
       if ($packages) {
         $owners_paths = id(new PhabricatorOwnersPath())->loadAllWhere(
           'repositoryPHID = %s AND packageID IN (%Ld)',