diff --git a/cc/config/global.go b/cc/config/global.go
index cfe576896..fac338812 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -144,9 +144,6 @@ var (
 
 		// Make paths in deps files relative.
 		"-no-canonical-prefixes",
-
-		// http://b/315250603 temporarily disabled
-		"-Wno-error=format",
 	}
 
 	commonGlobalConlyflags = []string{}
@@ -370,6 +367,9 @@ var (
 		"-Wno-gnu-offsetof-extensions",
 		// TODO: Enable this warning http://b/315245071
 		"-Wno-fortify-source",
+
+		// http://b/315250603 temporarily disabled
+		"-Wno-error=format",
 	}
 
 	llvmNextExtraCommonGlobalCflags = []string{