diff --git a/zetasql.yaml b/zetasql.yaml
index eb9f4e88d3e..575d0a05108 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -39,7 +39,7 @@ pipeline:
 
   - uses: patch
     with:
-      patches: multi-arch-for-linux.patch
+      patches: multi-arch-for-linux.patch no-llvm-deps.patch
 
   - runs: |
       cd zetasql
diff --git a/zetasql/no-llvm-deps.patch b/zetasql/no-llvm-deps.patch
new file mode 100644
index 00000000000..01d5dc15d60
--- /dev/null
+++ b/zetasql/no-llvm-deps.patch
@@ -0,0 +1,70 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index 994ce010..a792ed32 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -37,14 +37,6 @@ workspace(name = "com_google_zetasql")
+ 
+ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+ 
+-http_archive(
+-    name = "toolchains_llvm",
+-    canonical_id = "1.0.0",
+-    sha256 = "e91c4361f99011a54814e1afbe5c436e0d329871146a3cd58c23a2b4afb50737",
+-    strip_prefix = "toolchains_llvm-1.0.0",
+-    url = "https://github.com/bazel-contrib/toolchains_llvm/releases/download/1.0.0/toolchains_llvm-1.0.0.tar.gz",
+-)
+-
+ http_archive(
+     name = "rules_jvm_external",
+     sha256 = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6",
+diff --git a/bazel/zetasql_deps_step_1.bzl b/bazel/zetasql_deps_step_1.bzl
+index 825bf8ea..87d0fdb8 100644
+--- a/bazel/zetasql_deps_step_1.bzl
++++ b/bazel/zetasql_deps_step_1.bzl
+@@ -22,26 +22,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+ # but depend on them being something different. So we have to override them both
+ # by defining the repo first.
+ load("@com_google_zetasql//bazel:zetasql_bazel_version.bzl", "zetasql_bazel_version")
+-load("@toolchains_llvm//toolchain:deps.bzl", "bazel_toolchain_dependencies")
+-load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")
+ 
+ def zetasql_deps_step_1(add_bazel_version = True):
+     if add_bazel_version:
+         zetasql_bazel_version()
+ 
+-    bazel_toolchain_dependencies()
+-    llvm_toolchain(
+-        name = "llvm_toolchain",
+-        llvm_versions = {
+-            "": "16.0.0",
+-            # The LLVM repo stops providing pre-built binaries for the MacOS x86_64
+-            # architecture for versions >= 16.0.0: https://github.com/llvm/llvm-project/releases,
+-            # but our Kokoro MacOS tests are still using x86_64 (ventura).
+-            # TODO: Upgrade the MacOS version to sonoma-slcn.
+-            "darwin-x86_64": "15.0.7",
+-        },
+-    )
+-
+     http_archive(
+         name = "io_bazel_rules_go",
+         integrity = "sha256-M6zErg9wUC20uJPJ/B3Xqb+ZjCPn/yxFF3QdQEmpdvg=",
+diff --git a/bazel/zetasql_deps_step_2.bzl b/bazel/zetasql_deps_step_2.bzl
+index 6873dbe9..2b6b01fa 100644
+--- a/bazel/zetasql_deps_step_2.bzl
++++ b/bazel/zetasql_deps_step_2.bzl
+@@ -19,7 +19,6 @@
+ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
+ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
+-load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
+ load("@rules_bison//bison:bison.bzl", "bison_register_toolchains")
+ load("@rules_flex//flex:flex.bzl", "flex_register_toolchains")
+ load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
+@@ -29,7 +28,6 @@ load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
+ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+ 
+ def _load_deps_from_step_1():
+-    llvm_register_toolchains()
+     rules_foreign_cc_dependencies()
+ 
+ def textmapper_dependencies():