diff --git a/BUILD.gn b/BUILD.gn
index 64204f1be5..2b2e47aa58 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1016,8 +1016,8 @@ optional("sksl_interpreter") {
 }
 
 optional("skvm_jit") {
-  enabled = skia_enable_skvm_jit_when_possible
-  public_defines = [ "SKVM_JIT_WHEN_POSSIBLE" ]
+  enabled = skia_enable_skvm_jit
+  public_defines = [ "SKVM_JIT" ]
   if (skia_vtune_path != "") {
     public_defines += [ "SKVM_JIT_VTUNE" ]
     public_include_dirs = [ "$skia_vtune_path/include" ]
diff --git a/gn/skia.gni b/gn/skia.gni
index c3348b230a..ec7642d647 100644
--- a/gn/skia.gni
+++ b/gn/skia.gni
@@ -25,7 +25,10 @@ declare_args() {
   skia_enable_skottie = !(is_win && is_component_build)
   skia_enable_skrive = true
   skia_enable_sksl_interpreter = is_skia_dev_build
-  skia_enable_skvm_jit_when_possible = is_skia_dev_build
+  skia_enable_skvm_jit =
+      is_skia_dev_build &&
+      ((target_cpu == "x64" && (is_linux || is_mac || is_win)) ||
+       (target_cpu == "arm64" && is_android))
   skia_enable_tools = is_skia_dev_build
   skia_enable_gpu_debug_layers = is_skia_dev_build && is_debug
   skia_generate_workarounds = false
diff --git a/src/core/SkVM.h b/src/core/SkVM.h
index 6f22cd5e25..0623259add 100644
--- a/src/core/SkVM.h
+++ b/src/core/SkVM.h
@@ -19,19 +19,6 @@
 
 class SkWStream;
 
-#if defined(SKVM_JIT_WHEN_POSSIBLE)
-    #if defined(__x86_64__) || defined(_M_X64)
-        #if defined(_WIN32) || defined(__linux) || defined(__APPLE__)
-            #define SKVM_JIT
-        #endif
-    #endif
-    #if defined(__aarch64__)
-        #if defined(__ANDROID__)
-            #define SKVM_JIT
-        #endif
-    #endif
-#endif
-
 #if 0
     #define SKVM_LLVM
 #endif