diff --git a/src/applications/files/conduit/FileAllocateConduitAPIMethod.php b/src/applications/files/conduit/FileAllocateConduitAPIMethod.php
index ddf4e5d6bf..ae6c16ae03 100644
--- a/src/applications/files/conduit/FileAllocateConduitAPIMethod.php
+++ b/src/applications/files/conduit/FileAllocateConduitAPIMethod.php
@@ -17,9 +17,6 @@ final class FileAllocateConduitAPIMethod
       'contentLength' => 'int',
       'contentHash' => 'optional string',
       'viewPolicy' => 'optional string',
-
-      // TODO: Remove this, it's just here to make testing easier.
-      'forceChunking' => 'optional bool',
     );
   }
 
@@ -39,8 +36,6 @@ final class FileAllocateConduitAPIMethod
     $view_policy = $request->getValue('viewPolicy');
     $length = $request->getValue('contentLength');
 
-    $force_chunking = $request->getValue('forceChunking');
-
     $properties = array(
       'name' => $name,
       'authorPHID' => $viewer->getPHID(),
@@ -93,14 +88,6 @@ final class FileAllocateConduitAPIMethod
     $engines = PhabricatorFileStorageEngine::loadStorageEngines($length);
     if ($engines) {
 
-      if ($force_chunking) {
-        foreach ($engines as $key => $engine) {
-          if (!$engine->isChunkEngine()) {
-            unset($engines[$key]);
-          }
-        }
-      }
-
       // Pick the first engine. If the file is small enough to fit into a
       // single engine without chunking, this will be a non-chunk engine and
       // we'll just tell the client to upload the file.
diff --git a/src/applications/files/controller/PhabricatorFileDropUploadController.php b/src/applications/files/controller/PhabricatorFileDropUploadController.php
index 24433d7401..8ddad880a1 100644
--- a/src/applications/files/controller/PhabricatorFileDropUploadController.php
+++ b/src/applications/files/controller/PhabricatorFileDropUploadController.php
@@ -42,9 +42,6 @@ final class PhabricatorFileDropUploadController
         'name' => $name,
         'contentLength' => $request->getInt('length'),
         'viewPolicy' => $view_policy,
-
-        // TODO: Remove.
-        // 'forceChunking' => true,
       );
 
       $result = id(new ConduitCall('file.allocate', $params))