diff --git a/.bazelrc b/.bazelrc
index e86bb32859c..31b330ed4f8 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -15,7 +15,7 @@ build --test_timeout=3,15,60,240
 # As part of starlarkification, Bazel 8 and 9 remove a number of rules which now need to be imported
 # from other repositories. In the long term, load() statements will be needed to import these rules.
 # For now, we can still autoload the affected repositories when needed. Do this only for a remaining
-# protobuf components and rules_cc (needed with Bazel 9).
+# protobuf component and rules_cc (needed with Bazel 9).
 common --incompatible_autoload_externally="+ProtoInfo,+cc_binary,+cc_import,+cc_library,+cc_shared_library,+cc_test,+cc_toolchain"
 
 # TODO(cleanup): Bazel 9 sets this by default, which breaks the macOS-cross build. Fix and re-enable.
diff --git a/.github/workflows/_bazel.yml b/.github/workflows/_bazel.yml
index 8477284bc4e..11dc6b9fe15 100644
--- a/.github/workflows/_bazel.yml
+++ b/.github/workflows/_bazel.yml
@@ -117,14 +117,14 @@ jobs:
             # Strip comment in front of WORKERS_MIRROR_URL, then substitute secret to use it.
             sed -e '/WORKERS_MIRROR_URL/ { s@# *@@; s@WORKERS_MIRROR_URL@${{ secrets.WORKERS_MIRROR_URL }}@; }' -i.bak build/deps/nodejs.MODULE.bazel
           fi
-      - name: Bazel build (Windows workaround)
+      - name: Bazel build (windows exp nocache)
         if: runner.os == 'Windows'
-        # HACK: Work around Bazel Windows bug: Some targets need to be compiled without symlink
-        # support. Since we still need symlinks to compile C++ code properly, compile these targets
-        # separately.
+        # EXP: Check if Windows can now build without workaround
         run: |
-          bazel --nowindows_enable_symlinks build ${{ inputs.extra_bazel_args }} --config=ci --profile build-win-workaround.bazel-profile.gz --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev //src/wpt:wpt-all@tsproject //src/node:node@tsproject //src/pyodide:pyodide_static@tsproject
+          bazel build --config=ci ${{ inputs.extra_bazel_args }} //...
+          bazel test --config=ci ${{ inputs.extra_bazel_args }} ${{ inputs.test_target }}
       - name: Bazel build
+        if: runner.os != 'Windows'
         run: |
           bazel build --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev  --config=ci ${{ inputs.extra_bazel_args }} //...
       - name: Build and load container images
diff --git a/build/deps/gen/build_deps.MODULE.bazel b/build/deps/gen/build_deps.MODULE.bazel
index 325d4136b7f..2523677a98e 100644
--- a/build/deps/gen/build_deps.MODULE.bazel
+++ b/build/deps/gen/build_deps.MODULE.bazel
@@ -15,6 +15,13 @@ bazel_dep(name = "aspect_rules_esbuild", version = "0.25.0")
 
 # aspect_rules_js
 bazel_dep(name = "aspect_rules_js", version = "2.9.2")
+archive_override(
+    module_name = "aspect_rules_js",
+    integrity = "sha256-OsWVcoTGKM9zTkkwGq+gobXmXPSr/QzoJq7CYMwsPo0=",
+    strip_prefix = "aspect-build-rules_js-5a20c3a",
+    type = "tgz",
+    url = "https://github.com/aspect-build/rules_js/tarball/5a20c3a48a442ecaad5ff91f28ad1afe5c911a25",
+)
 
 # aspect_rules_lint
 bazel_dep(name = "aspect_rules_lint", version = "1.13.0")
diff --git a/src/pyodide/tsconfig.json b/src/pyodide/tsconfig.json
index 098a7f75f3c..46a40323141 100644
--- a/src/pyodide/tsconfig.json
+++ b/src/pyodide/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "extends": "../../tools/base.tsconfig.json",
+  "types": ["@types/node"],
   "compilerOptions": {
     "declaration": true,
     "paths": {
@@ -13,7 +14,6 @@
       "internal:*": ["./types/*"],
       "cloudflare-internal:*": ["./types/cloudflare-internal/*"]
     },
-    "typeRoots": ["./types"],
     "noEmit": false,
     "noEmitOnError": false,
     "allowArbitraryExtensions": true