diff --git a/test/robot/trace/client.go b/test/robot/trace/client.go
index 111f0f2c90..1600c72d9f 100644
--- a/test/robot/trace/client.go
+++ b/test/robot/trace/client.go
@@ -155,12 +155,11 @@ func doTrace(ctx context.Context, action string, in *Input, store *stash.Client,
 	params := []string{
 		"trace",
 		"-out", tracefile.System(),
-		"-apk", subject.System(),
 		"-for", traceTime.String(),
 		"-disable-pcs",
 		"-observe-frames", strconv.Itoa(observeEveryNthFrame),
 		"-record-errors",
-		"-gapii-device", d.Instance().Serial,
+		"-serial", d.Instance().Serial,
 		"-api", in.GetHints().GetAPI(),
 	}
 
@@ -174,9 +173,11 @@ func doTrace(ctx context.Context, action string, in *Input, store *stash.Client,
 		defer func() {
 			file.Remove(obb)
 		}()
-		params = append(params, "-obb", obb.System())
+		// TODO fix this
+		// params = append(params, "-obb", obb.System())
+		return log.Errf(ctx, nil, "OBBs are currently not supported")
 	}
-	cmd := shell.Command(gapit.System(), params...)
+	cmd := shell.Command(gapit.System(), append(params, "apk:"+subject.System())...)
 	outBuf := &bytes.Buffer{}
 	errBuf := &bytes.Buffer{}
 	outputObj := &Output{}