diff --git a/src/build/config/arm.gni b/src/build/config/arm.gni
index 28f1e24f..376171fa 100644
--- a/src/build/config/arm.gni
+++ b/src/build/config/arm.gni
@@ -17,7 +17,7 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
 
     # The ARM architecture. This will be a string like "armv6" or "armv7-a".
     # An empty string means to use the default for the arm_version.
-    arm_arch = "armv8.5-a"
+    arm_arch = ""
 
     # The ARM floating point hardware. This will be a string like "neon" or
     # "vfpv3". An empty string means to use the default for the arm_version.
@@ -26,13 +26,13 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
     # The ARM variant-specific tuning mode. This will be a string like "armv6"
     # or "cortex-a15". An empty string means to use the default for the
     # arm_version.
-    arm_tune = "generic-armv8.5-a"
+    arm_tune = ""
 
     # Whether to use the neon FPU instruction set or not.
     arm_use_neon = true
 
     # Whether to enable optional NEON code paths.
-    arm_optionally_use_neon = true
+    arm_optionally_use_neon = false
 
     # Thumb is a reduced instruction set available on some ARM processors that
     # has increased code density.
@@ -69,7 +69,7 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
 
   if (arm_version == 6) {
     if (arm_arch == "") {
-    # v8 can still with version 6 but only with the armv6k extension.
+      # v8 can still with version 6 but only with the armv6k extension.
       arm_arch = "armv6k"
     }
     if (arm_tune != "") {