diff --git a/share/mk/bsd.kern.mk b/share/mk/bsd.kern.mk
index 35a091aea0b1..a1de155ff2af 100644
--- a/share/mk/bsd.kern.mk
+++ b/share/mk/bsd.kern.mk
@@ -7,16 +7,10 @@
 # most of the remaining warnings.  Warnings introduced with -Wall will
 # also pop up, but are easier to fix.
 #
-# XXX FIXME - revert when there is a gcc3 with -fformat-extensions
-.ifndef GCC3
-CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-		-fformat-extensions -ansi
-.else
+# XXX FIXME - revert to -fformat-extensions when we've re-added it
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
 		-Wno-format -ansi
-.endif
 #
 # The following flags are next up for working on:
 #	-W
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 35a091aea0b1..a1de155ff2af 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -7,16 +7,10 @@
 # most of the remaining warnings.  Warnings introduced with -Wall will
 # also pop up, but are easier to fix.
 #
-# XXX FIXME - revert when there is a gcc3 with -fformat-extensions
-.ifndef GCC3
-CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-		-fformat-extensions -ansi
-.else
+# XXX FIXME - revert to -fformat-extensions when we've re-added it
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
 		-Wno-format -ansi
-.endif
 #
 # The following flags are next up for working on:
 #	-W