diff --git a/rbesetup.sh b/rbesetup.sh
index a8cb8ed35c..3e78a57262 100644
--- a/rbesetup.sh
+++ b/rbesetup.sh
@@ -63,6 +63,7 @@ function _set_rbe_vars() {
   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