diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -463,9 +463,6 @@
       $page->setUser($viewer);
     }
 
-    // TODO: Remove after removing callsites to addExtraQuicksandConfig().
-    $page->addQuicksandConfig($this->extraQuicksandConfig);
-
     return $page;
   }
 
@@ -534,22 +531,6 @@
 
 
   /**
-   * DEPRECATED.
-   */
-  private $extraQuicksandConfig = array();
-
-
-  /**
-   * DEPRECATED. Use @{method:newPage} and call addQuicksandConfig().
-   */
-  public function addExtraQuicksandConfig($config) {
-    // TODO: When this method is removed,
-    $this->extraQuicksandConfig += $config;
-    return $this;
-  }
-
-
-  /**
    * DEPRECATED. Use @{method:newPage}.
    */
   public function buildStandardPageView() {
diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
--- a/src/applications/pholio/controller/PholioMockEditController.php
+++ b/src/applications/pholio/controller/PholioMockEditController.php
@@ -382,12 +382,11 @@
       $form_box,
     );
 
-    $this->addExtraQuicksandConfig(
-      array('mockEditConfig' => true));
-
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
+      ->addQuicksandConfig(
+        array('mockEditConfig' => true))
       ->appendChild(
         array(
           $form_box,
diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -78,8 +78,6 @@
       ->setUser($viewer)
       ->setMock($mock)
       ->setImageID($image_id);
-    $this->addExtraQuicksandConfig(
-      array('mockViewConfig' => $mock_view->getBehaviorConfig()));
 
     $output = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Image'))
@@ -102,6 +100,8 @@
       ->setTitle('M'.$mock->getID().' '.$title)
       ->setCrumbs($crumbs)
       ->setPageObjectPHIDs(array($mock->getPHID()))
+      ->addQuicksandConfig(
+        array('mockViewConfig' => $mock_view->getBehaviorConfig()))
       ->appendChild(
         array(
           $object_box,