diff --git a/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php
index c620b18778..787446ee6a 100644
--- a/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php
@@ -1,26 +1,32 @@
 <?php
 
 final class DiffusionCommitAutocloseHeraldField
   extends DiffusionCommitHeraldField {
 
   const FIELDCONST = 'diffusion.commit.autoclose';
 
+  public function getFieldGroupKey() {
+    return HeraldDeprecatedFieldGroup::FIELDGROUPKEY;
+  }
+
   public function getHeraldFieldName() {
-    return pht('Commit is on permanent branch');
+    // Herald no longer triggers until a commit is reachable from a permanent
+    // ref, so this condition is always true by definition.
+    return pht('Commit Autocloses (Deprecated)');
   }
 
   public function getHeraldFieldValue($object) {
-    return $object->getRepository()->shouldAutocloseCommit($object);
+    return true;
   }
 
   public function getHeraldFieldConditions() {
     return array(
       HeraldAdapter::CONDITION_UNCONDITIONALLY,
     );
   }
 
   public function getHeraldFieldValueType($condition) {
     return new HeraldEmptyFieldValue();
   }
 
 }