diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1d9159f714..a134df5e1e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1362,6 +1362,7 @@ phutil_register_library_map(array(
     'HeraldController' => 'applications/herald/controller/HeraldController.php',
     'HeraldCoreStateReasons' => 'applications/herald/state/HeraldCoreStateReasons.php',
     'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
+    'HeraldDeprecatedFieldGroup' => 'applications/herald/field/HeraldDeprecatedFieldGroup.php',
     'HeraldDifferentialAdapter' => 'applications/differential/herald/HeraldDifferentialAdapter.php',
     'HeraldDifferentialDiffAdapter' => 'applications/differential/herald/HeraldDifferentialDiffAdapter.php',
     'HeraldDifferentialRevisionAdapter' => 'applications/differential/herald/HeraldDifferentialRevisionAdapter.php',
@@ -6561,6 +6562,7 @@ phutil_register_library_map(array(
     'HeraldController' => 'PhabricatorController',
     'HeraldCoreStateReasons' => 'HeraldStateReasons',
     'HeraldDAO' => 'PhabricatorLiskDAO',
+    'HeraldDeprecatedFieldGroup' => 'HeraldFieldGroup',
     'HeraldDifferentialAdapter' => 'HeraldAdapter',
     'HeraldDifferentialDiffAdapter' => 'HeraldDifferentialAdapter',
     'HeraldDifferentialRevisionAdapter' => array(
diff --git a/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php
index 2a09eff83e..420c2576ec 100644
--- a/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php
@@ -6,7 +6,11 @@ final class DiffusionCommitReviewerHeraldField
   const FIELDCONST = 'diffusion.commit.reviewer';
 
   public function getHeraldFieldName() {
-    return pht('Reviewer');
+    return pht('Reviewer (Deprecated)');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldDeprecatedFieldGroup::FIELDGROUPKEY;
   }
 
   public function getHeraldFieldValue($object) {
diff --git a/src/applications/herald/field/HeraldDeprecatedFieldGroup.php b/src/applications/herald/field/HeraldDeprecatedFieldGroup.php
new file mode 100644
index 0000000000..2b3bd5835c
--- /dev/null
+++ b/src/applications/herald/field/HeraldDeprecatedFieldGroup.php
@@ -0,0 +1,15 @@
+<?php
+
+final class HeraldDeprecatedFieldGroup extends HeraldFieldGroup {
+
+  const FIELDGROUPKEY = 'deprecated';
+
+  public function getGroupLabel() {
+    return pht('Deprecated');
+  }
+
+  protected function getGroupOrder() {
+    return 99999;
+  }
+
+}