diff --git a/runtime/configs.gni b/runtime/configs.gni
index 8d46b64812e..648083d882c 100644
--- a/runtime/configs.gni
+++ b/runtime/configs.gni
@@ -97,16 +97,6 @@ _all_configs = [
     configs = _jit_product_config
     snapshot = true
   },
-  {
-    suffix = "_jit_interpreter"
-    configs = _jit_interpreter_config
-    snapshot = true
-  },
-  {
-    suffix = "_jit_product_interpreter"
-    configs = _jit_product_interpreter_config
-    snapshot = true
-  },
   {
     suffix = "_precompiled_runtime"
     configs = _precompiled_runtime_config
@@ -149,6 +139,22 @@ _all_configs = [
   },
 ]
 
+# The interpreter is not currently needed on Windows.
+if (!is_win) {
+  _all_configs += [
+    {
+      suffix = "_jit_interpreter"
+      configs = _jit_interpreter_config
+      snapshot = true
+    },
+    {
+      suffix = "_jit_product_interpreter"
+      configs = _jit_product_interpreter_config
+      snapshot = true
+    },
+  ]
+}
+
 # This template creates a target for each of the configurations listed above.
 # For example:
 #
diff --git a/runtime/vm/native_arguments.h b/runtime/vm/native_arguments.h
index 910e2d631ce..ea9d33c0aaa 100644
--- a/runtime/vm/native_arguments.h
+++ b/runtime/vm/native_arguments.h
@@ -223,7 +223,7 @@ class NativeArguments {
                   RawObject** argv,
                   RawObject** retval)
       : thread_(thread),
-        argc_tag_(ReverseArgOrderBit::update(kReverseArgOrderBit, argc_tag)),
+        argc_tag_(ReverseArgOrderBit::update(true, argc_tag)),
         argv_(argv),
         retval_(retval) {}
 #endif