diff --git a/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php b/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php
index 9f589951c9..4363f666cd 100644
--- a/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php
+++ b/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@ class DifferentialCommentSaveController extends DifferentialController {
       ->setMessage($comment)
       ->setContentSource($content_source)
       ->setAttachInlineComments(true)
-      ->setAddCC($action != DifferentialAction::ACTION_RESIGN)
       ->setAddedReviewers($reviewers)
       ->setAddedCCs($ccs)
       ->save();
diff --git a/src/applications/differential/controller/commentsave/__init__.php b/src/applications/differential/controller/commentsave/__init__.php
index 7392c007a0..e0f7759809 100644
--- a/src/applications/differential/controller/commentsave/__init__.php
+++ b/src/applications/differential/controller/commentsave/__init__.php
@@ -8,7 +8,6 @@
 
 phutil_require_module('phabricator', 'aphront/response/400');
 phutil_require_module('phabricator', 'aphront/response/redirect');
-phutil_require_module('phabricator', 'applications/differential/constants/action');
 phutil_require_module('phabricator', 'applications/differential/controller/base');
 phutil_require_module('phabricator', 'applications/differential/editor/comment');
 phutil_require_module('phabricator', 'applications/differential/storage/revision');
diff --git a/src/applications/differential/editor/comment/DifferentialCommentEditor.php b/src/applications/differential/editor/comment/DifferentialCommentEditor.php
index 14545650df..afcd5de26e 100644
--- a/src/applications/differential/editor/comment/DifferentialCommentEditor.php
+++ b/src/applications/differential/editor/comment/DifferentialCommentEditor.php
@@ -24,7 +24,6 @@ class DifferentialCommentEditor {
 
   protected $attachInlineComments;
   protected $message;
-  protected $addCC;
   protected $changedByCommit;
   protected $addedReviewers = array();
   private $addedCCs = array();
@@ -57,11 +56,6 @@ class DifferentialCommentEditor {
     return $this;
   }
 
-  public function setAddCC($add) {
-    $this->addCC = $add;
-    return $this;
-  }
-
   public function setChangedByCommit($changed_by_commit) {
     $this->changedByCommit = $changed_by_commit;
     return $this;
@@ -315,7 +309,9 @@ class DifferentialCommentEditor {
     // top of the action list.
     $revision->save();
 
-    if ($this->addCC) {
+    if ($action != DifferentialAction::ACTION_RESIGN &&
+        $this->actorPHID != $revision->getAuthorPHID() &&
+        !in_array($this->actorPHID, $revision->getReviewers())) {
       DifferentialRevisionEditor::addCC(
         $revision,
         $this->actorPHID,
diff --git a/src/applications/differential/replyhandler/DifferentialReplyHandler.php b/src/applications/differential/replyhandler/DifferentialReplyHandler.php
index 7146b45d9f..b16dbde854 100644
--- a/src/applications/differential/replyhandler/DifferentialReplyHandler.php
+++ b/src/applications/differential/replyhandler/DifferentialReplyHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,7 +154,6 @@ class DifferentialReplyHandler extends PhabricatorMailReplyHandler {
         $editor->setParentMessageID($this->receivedMail->getMessageID());
       }
       $editor->setMessage($body);
-      $editor->setAddCC(($command != DifferentialAction::ACTION_RESIGN));
       $comment = $editor->save();
 
       return $comment->getID();