diff --git a/java/google/registry/tools/GenerateEscrowDepositCommand.java b/java/google/registry/tools/GenerateEscrowDepositCommand.java
index 8659c1fb8..b65a5e0fa 100644
--- a/java/google/registry/tools/GenerateEscrowDepositCommand.java
+++ b/java/google/registry/tools/GenerateEscrowDepositCommand.java
@@ -23,7 +23,6 @@ import com.beust.jcommander.Parameters;
 import com.google.appengine.api.modules.ModulesService;
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.TaskOptions;
-import com.google.common.base.Joiner;
 import google.registry.model.rde.RdeMode;
 import google.registry.rde.RdeModule;
 import google.registry.rde.RdeStagingAction;
@@ -103,10 +102,14 @@ final class GenerateEscrowDepositCommand implements RemoteApiCommand {
         withUrl(RdeStagingAction.PATH)
             .header("Host", hostname)
             .param(RdeModule.PARAM_MANUAL, String.valueOf(true))
-            .param(RequestParameters.PARAM_TLD, Joiner.on(',').join(tlds))
-            .param(RdeModule.PARAM_WATERMARK, Joiner.on(',').join(watermarks))
             .param(RdeModule.PARAM_MODE, mode.toString())
             .param(RdeModule.PARAM_DIRECTORY, outdir);
+    for (String tld : tlds) {
+      opts = opts.param(RequestParameters.PARAM_TLD, tld);
+    }
+    for (DateTime watermark : watermarks) {
+      opts = opts.param(RdeModule.PARAM_WATERMARK, watermark.toString());
+    }
     if (revision != null) {
       opts = opts.param(RdeModule.PARAM_REVISION, String.valueOf(revision));
     }
diff --git a/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java b/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
index 9aa7e7926..d2463e95d 100644
--- a/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
+++ b/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
@@ -189,8 +189,10 @@ public class GenerateEscrowDepositCommandTest
             .url("/_dr/task/rdeStaging")
             .header("Host", "1.backend.test.localhost")
             .param("mode", "THIN")
-            .param("watermark", "2017-01-01T00:00:00.000Z,2017-01-02T00:00:00.000Z")
-            .param("tld", "tld,anothertld")
+            .param("watermark", "2017-01-01T00:00:00.000Z")
+            .param("watermark", "2017-01-02T00:00:00.000Z")
+            .param("tld", "tld")
+            .param("tld", "anothertld")
             .param("directory", "test")
             .param("manual", "true")
             .param("revision", "42"));