diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
index 6513ef9b..01742084 100644
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -2173,10 +2173,11 @@ EOTEXT
 
   private function loadActiveLocalCommitInfo() {
     $current_diff = $this->getConduit()->callMethodSynchronous(
-      'differential.getdiff',
+      'differential.querydiffs',
       array(
-        'revision_id' => $this->revisionID,
+        'revisionIDs' => array($this->revisionID),
       ));
+    $current_diff = head($current_diff);
 
     $properties = idx($current_diff, 'properties', array());
     return idx($properties, 'local:commits', array());
diff --git a/src/workflow/ArcanistFeatureWorkflow.php b/src/workflow/ArcanistFeatureWorkflow.php
index 5ddf0fef..b69074a0 100644
--- a/src/workflow/ArcanistFeatureWorkflow.php
+++ b/src/workflow/ArcanistFeatureWorkflow.php
@@ -124,10 +124,11 @@ EOTEXT
       if (preg_match('/^D(\d+)$/', $name, $match)) {
         try {
           $diff = $this->getConduit()->callMethodSynchronous(
-            'differential.getdiff',
+            'differential.querydiffs',
             array(
-              'revision_id' => $match[1],
+              'revisionIDs' => array($match[1]),
             ));
+          $diff = head($diff);
 
           if ($diff['branch'] != '') {
             $name = $diff['branch'];
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
index 7c571986..5aedab7d 100644
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -1064,7 +1064,7 @@ abstract class ArcanistWorkflow extends Phobject {
     return $this->loadBundleFromConduit(
       $conduit,
       array(
-      'diff_id' => $diff_id,
+      'ids' => array($diff_id),
     ));
   }
 
@@ -1075,7 +1075,7 @@ abstract class ArcanistWorkflow extends Phobject {
     return $this->loadBundleFromConduit(
       $conduit,
       array(
-      'revision_id' => $revision_id,
+      'revisionIDs' => array($revision_id),
     ));
   }
 
@@ -1083,8 +1083,8 @@ abstract class ArcanistWorkflow extends Phobject {
     ConduitClient $conduit,
     $params) {
 
-    $future = $conduit->callMethod('differential.getdiff', $params);
-    $diff = $future->resolve();
+    $future = $conduit->callMethod('differential.querydiffs', $params);
+    $diff = head($future->resolve());
 
     $changes = array();
     foreach ($diff['changes'] as $changedict) {