diff --git a/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php b/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
index 853934a63d..b1582078e9 100644
--- a/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
+++ b/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
@@ -1,119 +1,111 @@
 <?php
 
 final class PhabricatorDifferentialRevisionTestDataGenerator
   extends PhabricatorTestDataGenerator {
 
   public function generate() {
     $author = $this->loadPhabrictorUser();
     $authorPHID = $author->getPHID();
     $revision = DifferentialRevision::initializeNewRevision($author);
     $revision->setTitle($this->generateTitle());
     $revision->setSummary($this->generateDescription());
     $revision->setTestPlan($this->generateDescription());
     $revision->loadRelationships();
     $aux_fields = $this->loadAuxiliaryFields($author, $revision);
     $diff = $this->generateDiff($author);
     // Add Diff
     $editor = new DifferentialRevisionEditor($revision);
     $editor->setActor($author);
     $editor->addDiff($diff, $this->generateDescription());
     $editor->setAuxiliaryFields($aux_fields);
     $editor->save();
-    // Add Reviewers
-    $editor2 = new DifferentialCommentEditor($revision,
-      DifferentialAction::ACTION_ADDREVIEWERS);
-    $editor2->setActor($author);
-    $editor2->setAddedReviewers($this->getCCPHIDs());
-    $editor2->save();
-    // Add CCs
-    $editor3 = new DifferentialCommentEditor($revision,
-      DifferentialAction::ACTION_ADDCCS);
-    $editor3->setActor($author);
-    $editor3->setAddedCCs($this->getCCPHIDs());
-    $editor3->save();
+
+    // TODO: After T2222, it would be nice to revisit this and expand the
+    // functionality.
+
     return $revision->save();
   }
 
   public function getCCPHIDs() {
     $ccs = array();
     for ($i = 0; $i < rand(1, 4);$i++) {
       $ccs[] = $this->loadPhabrictorUserPHID();
     }
     return $ccs;
   }
 
   public function generateDiff($author) {
     $paste_generator = new PhabricatorPasteTestDataGenerator();
     $languages = $paste_generator->supportedLanguages;
     $lang = array_rand($languages);
     $code = $paste_generator->generateContent($lang);
     $altcode = $paste_generator->generateContent($lang);
     $newcode = $this->randomlyModify($code, $altcode);
     $diff = id(new PhabricatorDifferenceEngine())
       ->generateRawDiffFromFileContent($code, $newcode);
      $call = new ConduitCall(
         'differential.createrawdiff',
         array(
           'diff' => $diff,
         ));
     $call->setUser($author);
     $result = $call->execute();
     $thediff = id(new DifferentialDiff())->load(
       $result['id']);
     $thediff->setDescription($this->generateTitle())->save();
     return $thediff;
   }
 
   public function generateDescription() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generate(10, 20);
   }
 
   public function generateTitle() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generate();
   }
 
   public function randomlyModify($code, $altcode) {
     $codearr = explode("\n", $code);
     $altcodearr = explode("\n", $altcode);
     $no_lines_to_delete = rand(1,
       min(count($codearr) - 2, 5));
     $randomlines = array_rand($codearr,
       count($codearr) - $no_lines_to_delete);
     $newcode = array();
     foreach ($randomlines as $lineno) {
       $newcode[] = $codearr[$lineno];
     }
     $newlines_count = rand(2,
       min(count($codearr) - 2, count($altcodearr) - 2, 5));
     $randomlines_orig = array_rand($codearr, $newlines_count);
     $randomlines_new = array_rand($altcodearr, $newlines_count);
     $newcode2 = array();
     $c = 0;
     for ($i = 0; $i < count($newcode);$i++) {
       $newcode2[] = $newcode[$i];
       if (in_array($i, $randomlines_orig)) {
         $newcode2[] = $altcodearr[$randomlines_new[$c++]];
       }
     }
     return implode($newcode2, "\n");
   }
 
   private function loadAuxiliaryFields($user, DifferentialRevision $revision) {
     $aux_fields = DifferentialFieldSelector::newSelector()
       ->getFieldSpecifications();
     foreach ($aux_fields as $key => $aux_field) {
       $aux_field->setRevision($revision);
       if (!$aux_field->shouldAppearOnEdit()) {
         unset($aux_fields[$key]);
       } else {
         $aux_field->setUser($user);
       }
     }
     return DifferentialAuxiliaryField::loadFromStorage(
       $revision,
       $aux_fields);
   }
 
 }