diff --git a/.bazelrc b/.bazelrc
index e01e6a8482..b0d3f22eaa 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -35,8 +35,9 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # See https://github.com/bazelbuild/bazel/issues/4603
 build --symlink_prefix=dist/
 
-# Performance: avoid stat'ing input files
-build --watchfs
+# Disable watchfs as it causes tests to be flaky on Windows
+# https://github.com/angular/angular/issues/29541
+build --nowatchfs
 
 # Turn off legacy external runfiles
 run --nolegacy_external_runfiles
diff --git a/.codefresh/bazel.rc b/.codefresh/bazel.rc
index 434f22da3f..5a2fa5ca6d 100644
--- a/.codefresh/bazel.rc
+++ b/.codefresh/bazel.rc
@@ -36,10 +36,6 @@ build --verbose_failures=true
 build --action_env=PATH
 test --action_env=PATH --test_env=PATH
 
-# Disable watchfs on Windows as it causes tests to be flaky
-# https://github.com/angular/angular/issues/29541
-build --nowatchfs
-
 # Exclude tests known to not work on Windows.
 
 # Chrome web tests are currently broken.