Index: src/applications/differential/controller/DifferentialRevisionViewController.php
===================================================================
--- src/applications/differential/controller/DifferentialRevisionViewController.php
+++ src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -949,6 +949,11 @@
       ->setChangesets($changesets)
       ->setTransactions($xactions);
 
+    // TODO: Make this work and restore edit links. We need to copy
+    // `revisionPHID` to the new version of the comment. This should be simple,
+    // but can happen post-merge. See T2222.
+    $timeline->setShowEditActions(false);
+
     return $timeline;
   }