diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php
--- a/src/applications/differential/parser/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/DifferentialChangesetParser.php
@@ -669,6 +669,20 @@
     return true;
   }
 
+  private function hasCommentsFromReviewers() {
+    if (!$this->comments) {
+      return false;
+    }
+
+    foreach ($this->comments as $comment) {
+      if (substr($comment->getSyntheticAuthor(), 0, 6) !== 'Lint: ') {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   public function render(
     $range_start  = null,
     $range_len    = null,
@@ -710,7 +724,7 @@
     }
 
     $shield = null;
-    if ($this->isTopLevel && !$this->comments) {
+    if ($this->isTopLevel && !$this->hasCommentsFromReviewers()) {
       if ($this->isGenerated()) {
         $shield = $renderer->renderShield(
           pht(
@@ -738,7 +752,8 @@
       } else if ($this->isDeleted()) {
         $shield = $renderer->renderShield(
           pht('This file was completely deleted.'));
-      } else if ($this->changeset->getAffectedLineCount() > 2500) {
+      } else if (!$this->comments &&
+                 $this->changeset->getAffectedLineCount() > 2500) {
         $lines = number_format($this->changeset->getAffectedLineCount());
         $shield = $renderer->renderShield(
           pht(