diff --git a/infra/ansible/config/env.yaml b/infra/ansible/config/env.yaml
index f77b15a6920..783fc69b621 100644
--- a/infra/ansible/config/env.yaml
+++ b/infra/ansible/config/env.yaml
@@ -33,6 +33,7 @@ build_env:
     BAZEL_REMOTE_CACHE: 1
     SILO_NAME: "cache-silo-{{ arch }}-{{ accelerator }}-{{ clang_version }}"
     DISABLE_XRT: "{{ disable_xrt }}"
+    _GLIBCXX_USE_CXX11_ABI: 0
 
   amd64:
     ARCH: amd64
diff --git a/infra/ansible/roles/build_srcs/tasks/main.yaml b/infra/ansible/roles/build_srcs/tasks/main.yaml
index 09e221705ba..2cd7cff6f1c 100644
--- a/infra/ansible/roles/build_srcs/tasks/main.yaml
+++ b/infra/ansible/roles/build_srcs/tasks/main.yaml
@@ -24,7 +24,7 @@
 
 - name: Build XLA computation client library
   ansible.builtin.command:
-    cmd: bash build_torch_xla_libs.sh -O -D_GLIBCXX_USE_CXX11_ABI=1
+    cmd: bash build_torch_xla_libs.sh
     chdir: "{{ (src_root, 'pytorch/xla') | path_join }}"
   environment: "{{ env_vars }}"
   when: build_torch_xla_libs_result.stat.exists