diff --git a/builtin/rebase.c b/builtin/rebase.c
index 7c7bc13e912aa8..4356996698fa22 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1142,13 +1142,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	 */
 
 	if (!use_builtin_rebase()) {
-		const char *path = mkpath("%s/git-legacy-rebase",
-					  git_exec_path());
-
-		if (sane_execvp(path, (char **)argv) < 0)
-			die_errno(_("could not exec %s"), path);
-		else
-			BUG("sane_execvp() returned???");
+		struct argv_array args = ARGV_ARRAY_INIT;
+		int code;
+
+		argv_array_push(&args, mkpath("%s/git-legacy-rebase",
+					      git_exec_path()));
+		argv_array_pushv(&args, argv + 1);
+		code = run_command_v_opt(args.argv, 0);
+		if (code < 0)
+			die_errno(_("could not exec %s"), args.argv[0]);
+		argv_array_clear(&args);
+		exit(code);
 	}
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
diff --git a/builtin/stash.c b/builtin/stash.c
index 794fba6e2d5c88..a5ffb10ce6ae25 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -1555,13 +1555,17 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 	};
 
 	if (!use_builtin_stash()) {
-		const char *path = mkpath("%s/git-legacy-stash",
-					  git_exec_path());
-
-		if (sane_execvp(path, (char **)argv) < 0)
-			die_errno(_("could not exec %s"), path);
-		else
-			BUG("sane_execvp() returned???");
+		struct argv_array args = ARGV_ARRAY_INIT;
+		int code;
+
+		argv_array_push(&args, mkpath("%s/git-legacy-stash",
+					      git_exec_path()));
+		argv_array_pushv(&args, argv + 1);
+		code = run_command_v_opt(args.argv, 0);
+		if (code < 0)
+			die_errno(_("could not exec %s"), args.argv[0]);
+		argv_array_clear(&args);
+		exit(code);
 	}
 
 	prefix = setup_git_directory();