diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index e10b4b2802..a1720bb5d5 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -463,9 +463,6 @@ abstract class PhabricatorController extends AphrontController {
       $page->setUser($viewer);
     }
 
-    // TODO: Remove after removing callsites to addExtraQuicksandConfig().
-    $page->addQuicksandConfig($this->extraQuicksandConfig);
-
     return $page;
   }
 
@@ -533,22 +530,6 @@ abstract class PhabricatorController extends AphrontController {
 /* -(  Deprecated  )--------------------------------------------------------- */
 
 
-  /**
-   * 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}.
    */
diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
index 857f21909b..1eff4f8716 100644
--- a/src/applications/pholio/controller/PholioMockEditController.php
+++ b/src/applications/pholio/controller/PholioMockEditController.php
@@ -382,12 +382,11 @@ final class PholioMockEditController extends PholioController {
       $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
index 8e527ddc57..2bf237ed0e 100644
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -78,8 +78,6 @@ final class PholioMockViewController extends PholioController {
       ->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 @@ final class PholioMockViewController extends PholioController {
       ->setTitle('M'.$mock->getID().' '.$title)
       ->setCrumbs($crumbs)
       ->setPageObjectPHIDs(array($mock->getPHID()))
+      ->addQuicksandConfig(
+        array('mockViewConfig' => $mock_view->getBehaviorConfig()))
       ->appendChild(
         array(
           $object_box,