diff --git a/rbesetup.sh b/rbesetup.sh
index 0182bfd..410ed86 100644
--- a/rbesetup.sh
+++ b/rbesetup.sh
@@ -66,6 +66,7 @@
   unset USE_GOMA
   export USE_RBE="true"
   export RBE_CXX_EXEC_STRATEGY="remote_local_fallback"
+  export RBE_use_unified_cas_ops="true"
   export RBE_JAVAC=1
   export RBE_R8=1
   export RBE_D8=1