Windows is a mystery...
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 3284dfe..400903b 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -90,8 +90,14 @@
     environment:
       BAZEL_EXTRA_FLAGS: "--cxxopt=/std:c++17 --host_cxxopt=/std:c++17"
     batch_commands:
-     - cd examples/c/c_proto_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/c/c_proto_library && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - echo c_proto_compile
+     - cd examples/c/c_proto_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo c_proto_library
+     - cd examples/c/c_proto_library
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
 
   c_macos_examples:
     name: C
@@ -121,10 +127,22 @@
     environment:
       BAZEL_EXTRA_FLAGS: "--cxxopt=/std:c++17 --host_cxxopt=/std:c++17"
     batch_commands:
-     - cd examples/cpp/cpp_proto_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/cpp/cpp_grpc_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/cpp/cpp_proto_library && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/cpp/cpp_grpc_library && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - echo cpp_proto_compile
+     - cd examples/cpp/cpp_proto_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo cpp_grpc_compile
+     - cd examples/cpp/cpp_grpc_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo cpp_proto_library
+     - cd examples/cpp/cpp_proto_library
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo cpp_grpc_library
+     - cd examples/cpp/cpp_grpc_library
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
 
   cpp_macos_examples:
     name: C++
@@ -157,11 +175,26 @@
     environment:
       BAZEL_EXTRA_FLAGS: "--cxxopt=/std:c++17 --host_cxxopt=/std:c++17"
     batch_commands:
-     - cd examples/doc/doc_docbook_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/doc/doc_html_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/doc/doc_json_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/doc/doc_markdown_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/doc/doc_template_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - echo doc_docbook_compile
+     - cd examples/doc/doc_docbook_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo doc_html_compile
+     - cd examples/doc/doc_html_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo doc_json_compile
+     - cd examples/doc/doc_json_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo doc_markdown_compile
+     - cd examples/doc/doc_markdown_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo doc_template_compile
+     - cd examples/doc/doc_template_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
 
   doc_macos_examples:
     name: Documentation
@@ -194,10 +227,22 @@
     environment:
       BAZEL_EXTRA_FLAGS: "--cxxopt=/std:c++17 --host_cxxopt=/std:c++17"
     batch_commands:
-     - cd examples/go/go_proto_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/go/go_grpc_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/go/go_proto_library && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/go/go_grpc_library && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - echo go_proto_compile
+     - cd examples/go/go_proto_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo go_grpc_compile
+     - cd examples/go/go_grpc_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo go_proto_library
+     - cd examples/go/go_proto_library
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo go_grpc_library
+     - cd examples/go/go_grpc_library
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
 
   go_macos_examples:
     name: Go
@@ -228,7 +273,10 @@
     environment:
       BAZEL_EXTRA_FLAGS: "--cxxopt=/std:c++17 --host_cxxopt=/std:c++17"
     batch_commands:
-     - cd examples/grpc_gateway/gateway_grpc_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - echo gateway_grpc_compile
+     - cd examples/grpc_gateway/gateway_grpc_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
 
   grpc_gateway_macos_examples:
     name: gRPC-Gateway
@@ -273,9 +321,18 @@
     environment:
       BAZEL_EXTRA_FLAGS: "--cxxopt=/std:c++17 --host_cxxopt=/std:c++17"
     batch_commands:
-     - cd examples/python/python_proto_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/python/python_grpc_compile && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
-     - cd examples/python/python_proto_library && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - echo python_proto_compile
+     - cd examples/python/python_proto_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo python_grpc_compile
+     - cd examples/python/python_grpc_compile
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
+     - echo python_proto_library
+     - cd examples/python/python_proto_library
+     - bazel --batch build %BAZEL_EXTRA_FLAGS% --verbose_failures --disk_cache=../../bazel-disk-cache //...
+     - cd ../../..
 
   python_macos_examples:
     name: Python
diff --git a/examples/Makefile.mk b/examples/Makefile.mk
index 27a075b..5df53a5 100644
--- a/examples/Makefile.mk
+++ b/examples/Makefile.mk
@@ -1,12 +1,12 @@
 .PHONY: buf_buf_proto_breaking_test_example
 buf_buf_proto_breaking_test_example:
 	cd examples/buf/buf_proto_breaking_test; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --test_output=errors --disk_cache=../../bazel-disk-cache //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --test_output=errors --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: buf_buf_proto_lint_test_example
 buf_buf_proto_lint_test_example:
 	cd examples/buf/buf_proto_lint_test; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --test_output=errors --disk_cache=../../bazel-disk-cache //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --test_output=errors --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: buf_examples
 buf_examples: buf_buf_proto_breaking_test_example buf_buf_proto_lint_test_example
@@ -14,12 +14,12 @@
 .PHONY: c_c_proto_compile_example
 c_c_proto_compile_example:
 	cd examples/c/c_proto_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: c_c_proto_library_example
 c_c_proto_library_example:
 	cd examples/c/c_proto_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: c_examples
 c_examples: c_c_proto_compile_example c_c_proto_library_example
@@ -27,22 +27,22 @@
 .PHONY: cpp_cpp_proto_compile_example
 cpp_cpp_proto_compile_example:
 	cd examples/cpp/cpp_proto_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: cpp_cpp_grpc_compile_example
 cpp_cpp_grpc_compile_example:
 	cd examples/cpp/cpp_grpc_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: cpp_cpp_proto_library_example
 cpp_cpp_proto_library_example:
 	cd examples/cpp/cpp_proto_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: cpp_cpp_grpc_library_example
 cpp_cpp_grpc_library_example:
 	cd examples/cpp/cpp_grpc_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: cpp_examples
 cpp_examples: cpp_cpp_proto_compile_example cpp_cpp_grpc_compile_example cpp_cpp_proto_library_example cpp_cpp_grpc_library_example
@@ -50,27 +50,27 @@
 .PHONY: doc_doc_docbook_compile_example
 doc_doc_docbook_compile_example:
 	cd examples/doc/doc_docbook_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: doc_doc_html_compile_example
 doc_doc_html_compile_example:
 	cd examples/doc/doc_html_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: doc_doc_json_compile_example
 doc_doc_json_compile_example:
 	cd examples/doc/doc_json_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: doc_doc_markdown_compile_example
 doc_doc_markdown_compile_example:
 	cd examples/doc/doc_markdown_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: doc_doc_template_compile_example
 doc_doc_template_compile_example:
 	cd examples/doc/doc_template_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: doc_examples
 doc_examples: doc_doc_docbook_compile_example doc_doc_html_compile_example doc_doc_json_compile_example doc_doc_markdown_compile_example doc_doc_template_compile_example
@@ -78,22 +78,22 @@
 .PHONY: go_go_proto_compile_example
 go_go_proto_compile_example:
 	cd examples/go/go_proto_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: go_go_grpc_compile_example
 go_go_grpc_compile_example:
 	cd examples/go/go_grpc_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: go_go_proto_library_example
 go_go_proto_library_example:
 	cd examples/go/go_proto_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: go_go_grpc_library_example
 go_go_grpc_library_example:
 	cd examples/go/go_grpc_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: go_examples
 go_examples: go_go_proto_compile_example go_go_grpc_compile_example go_go_proto_library_example go_go_grpc_library_example
@@ -101,17 +101,17 @@
 .PHONY: grpc_gateway_gateway_grpc_compile_example
 grpc_gateway_gateway_grpc_compile_example:
 	cd examples/grpc_gateway/gateway_grpc_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: grpc_gateway_gateway_openapiv2_compile_example
 grpc_gateway_gateway_openapiv2_compile_example:
 	cd examples/grpc_gateway/gateway_openapiv2_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: grpc_gateway_gateway_grpc_library_example
 grpc_gateway_gateway_grpc_library_example:
 	cd examples/grpc_gateway/gateway_grpc_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: grpc_gateway_examples
 grpc_gateway_examples: grpc_gateway_gateway_grpc_compile_example grpc_gateway_gateway_openapiv2_compile_example grpc_gateway_gateway_grpc_library_example
@@ -119,22 +119,22 @@
 .PHONY: objc_objc_proto_compile_example
 objc_objc_proto_compile_example:
 	cd examples/objc/objc_proto_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: objc_objc_grpc_compile_example
 objc_objc_grpc_compile_example:
 	cd examples/objc/objc_grpc_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: objc_objc_proto_library_example
 objc_objc_proto_library_example:
 	cd examples/objc/objc_proto_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: objc_objc_grpc_library_example
 objc_objc_grpc_library_example:
 	cd examples/objc/objc_grpc_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: objc_examples
 objc_examples: objc_objc_proto_compile_example objc_objc_grpc_compile_example objc_objc_proto_library_example objc_objc_grpc_library_example
@@ -142,32 +142,32 @@
 .PHONY: python_python_proto_compile_example
 python_python_proto_compile_example:
 	cd examples/python/python_proto_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: python_python_grpc_compile_example
 python_python_grpc_compile_example:
 	cd examples/python/python_grpc_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: python_python_grpclib_compile_example
 python_python_grpclib_compile_example:
 	cd examples/python/python_grpclib_compile; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: python_python_proto_library_example
 python_python_proto_library_example:
 	cd examples/python/python_proto_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: python_python_grpc_library_example
 python_python_grpc_library_example:
 	cd examples/python/python_grpc_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: python_python_grpclib_library_example
 python_python_grpclib_library_example:
 	cd examples/python/python_grpclib_library; \
-	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
+	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...
 
 .PHONY: python_examples
 python_examples: python_python_proto_compile_example python_python_grpc_compile_example python_python_grpclib_compile_example python_python_proto_library_example python_python_grpc_library_example python_python_grpclib_library_example
diff --git a/test_workspaces/Makefile.mk b/test_workspaces/Makefile.mk
index eddfb64..a2d203e 100644
--- a/test_workspaces/Makefile.mk
+++ b/test_workspaces/Makefile.mk
@@ -1,82 +1,82 @@
 .PHONY: test_workspace_absolute_strip_import_prefix
 test_workspace_absolute_strip_import_prefix:
 	cd test_workspaces/absolute_strip_import_prefix; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_combined_strip_and_add_prefix
 test_workspace_combined_strip_and_add_prefix:
 	cd test_workspaces/combined_strip_and_add_prefix; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_common_cpp_library
 test_workspace_common_cpp_library:
 	cd test_workspaces/common_cpp_library; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_exclusions
 test_workspace_exclusions:
 	cd test_workspaces/exclusions; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_generated_proto
 test_workspace_generated_proto:
 	cd test_workspaces/generated_proto; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_go_fixer
 test_workspace_go_fixer:
 	cd test_workspaces/go_fixer; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_go_importpath
 test_workspace_go_importpath:
 	cd test_workspaces/go_importpath; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_import_prefix
 test_workspace_import_prefix:
 	cd test_workspaces/import_prefix; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_nested_output_directory
 test_workspace_nested_output_directory:
 	cd test_workspaces/nested_output_directory; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_objc_capitalisation
 test_workspace_objc_capitalisation:
 	cd test_workspaces/objc_capitalisation; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_python3_grpc
 test_workspace_python3_grpc:
 	cd test_workspaces/python3_grpc; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_python_dashes
 test_workspace_python_dashes:
 	cd test_workspaces/python_dashes; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_python_deps
 test_workspace_python_deps:
 	cd test_workspaces/python_deps; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_relative_strip_import_prefix
 test_workspace_relative_strip_import_prefix:
 	cd test_workspaces/relative_strip_import_prefix; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_shared_proto
 test_workspace_shared_proto:
 	cd test_workspaces/shared_proto; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: test_workspace_special_characters
 test_workspace_special_characters:
 	cd test_workspaces/special_characters; \
-	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
+	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...
 
 .PHONY: all_test_workspaces
 all_test_workspaces: test_workspace_absolute_strip_import_prefix test_workspace_combined_strip_and_add_prefix test_workspace_common_cpp_library test_workspace_exclusions test_workspace_generated_proto test_workspace_go_fixer test_workspace_go_importpath test_workspace_import_prefix test_workspace_nested_output_directory test_workspace_objc_capitalisation test_workspace_python3_grpc test_workspace_python_dashes test_workspace_python_deps test_workspace_relative_strip_import_prefix test_workspace_shared_proto test_workspace_special_characters
diff --git a/tools/rulegen/main.go b/tools/rulegen/main.go
index 31d5d2b..a21ac5d 100644
--- a/tools/rulegen/main.go
+++ b/tools/rulegen/main.go
@@ -505,10 +505,12 @@
 				}
 
 				if ciPlatform == "windows" {
+					out.w("     - echo %s", rule.Name)
+					out.w("     - cd %s", path.Join(dir, "examples", lang.Name, rule.Name))
 					out.w(
-						"     - cd %s && bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...",
-						path.Join(dir, "examples", lang.Name, rule.Name),
+						"     - bazel --batch build %%BAZEL_EXTRA_FLAGS%% --verbose_failures --disk_cache=../../bazel-disk-cache //...",
 					)
+					out.w("     - cd ../../..")
 				} else {
 					out.w("     - make %s_%s_example", lang.Name, rule.Name)
 				}
@@ -571,9 +573,9 @@
 			out.w("	cd %s; \\", exampleDir)
 
 			if rule.IsTest {
-				out.w("	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --test_output=errors --disk_cache=../../bazel-disk-cache //...")
+				out.w("	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --test_output=errors --disk_cache=../../bazel-disk-cache //...")
 			} else {
-				out.w("	bazel --batch build --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...")
+				out.w("	bazel --batch build ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../../bazel-disk-cache //...")
 			}
 			out.ln()
 		}
@@ -604,7 +606,7 @@
 		out.w(".PHONY: %s", name)
 		out.w("%s:", name)
 		out.w("	cd %s; \\", path.Join(dir, "test_workspaces", testWorkspace))
-		out.w("	bazel --batch test --enable_bzlmod ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...")
+		out.w("	bazel --batch test ${BAZEL_EXTRA_FLAGS} --verbose_failures --disk_cache=../bazel-disk-cache --test_output=errors //...")
 		out.ln()
 	}