diff --git a/taskcluster/scripts/misc/build-gn-common.sh b/taskcluster/scripts/misc/build-gn-common.sh
index 56ced2417b7e..c609cfd99baa 100755
--- a/taskcluster/scripts/misc/build-gn-common.sh
+++ b/taskcluster/scripts/misc/build-gn-common.sh
@@ -2,14 +2,15 @@
 set -e -v
 
 # This is shared code for building GN.
-: GN_REV                 ${GN_REV:=1ab6fa2cab7ec64840db720a56018ca8939329f9}
+: GN_REV                 ${GN_REV:=d69a9c3765dee2e650bcccebbadf72c5d42d92b1}
 
 
 git clone --no-checkout https://gn.googlesource.com/gn $WORKSPACE/gn-standalone
 cd $WORKSPACE/gn-standalone
 git checkout $GN_REV
 
-# Remove /MACHINE:x64 because we just let the PATH decide what cl and link are
+# We remove /WC because of https://bugs.chromium.org/p/gn/issues/detail?id=51
+# And /MACHINE:x64 because we just let the PATH decide what cl and link are
 # used, and if cl is targetting x86, we don't want linkage to fail because of
 # /MACHINE:x64.
 patch -p1 <<'EOF'
@@ -17,7 +18,15 @@ diff --git a/build/gen.py b/build/gen.py
 index a7142fab..78d0fd56 100755
 --- a/build/gen.py
 +++ b/build/gen.py
-@@ -373,7 +373,7 @@ def WriteGNNinja(path, platform, host, options):
+@@ -357,7 +357,6 @@ def WriteGNNinja(path, platform, host, options):
+         '/D_WIN32_WINNT=0x0A00',
+         '/FS',
+         '/W4',
+-        '/WX',
+         '/Zi',
+         '/wd4099',
+         '/wd4100',
+@@ -373,7 +372,7 @@ def WriteGNNinja(path, platform, host, options):
          '/D_HAS_EXCEPTIONS=0',
      ])