diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index e312469..6606100 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -155,14 +155,6 @@
 			// better solution comes around. See Bug 27340895
 			"-D__ARM_FEATURE_LPAE=1",
 		},
-		"kryo": []string{
-			"-mcpu=cortex-a15",
-			// Fake an ARM compiler flag as these processors support LPAE which GCC/clang
-			// don't advertise.
-			// TODO This is a hack and we need to add it for each processor that supports LPAE until some
-			// better solution comes around. See Bug 27340895
-			"-D__ARM_FEATURE_LPAE=1",
-		},
 	}
 
 	armClangCpuVariantCflags  = copyVariantFlags(armCpuVariantCflags)
@@ -199,9 +191,6 @@
 	replaceFirst(armClangCpuVariantCflags["krait"], "-mcpu=cortex-a15", "-mcpu=krait")
 	replaceFirst(armClangCpuVariantCflags["kryo"], "-mcpu=cortex-a15", "-mcpu=krait")
 
-	replaceFirst(armClangCpuVariantCflags["kryo"], "-mcpu=cortex-a15", "-mcpu=krait")
-	armClangCpuVariantCflags["kryo"] = append(armClangCpuVariantCflags["kryo"], "-mfpu=neon-vfpv4")
-
 	pctx.StaticVariable("armGccVersion", armGccVersion)
 
 	pctx.SourcePathVariable("ArmGccRoot",