diff --git a/WORKSPACE b/WORKSPACE
index 3f68df09a9d..fd77da4a316 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -63,8 +63,7 @@ py_proto_repositories()
 
 load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
 
-# Creates toolchain configuration for remote execution with BuildKite CI
-# for rbe_ubuntu1604
+# Create toolchain configuration for remote execution.
 rbe_autoconfig(
     name = "rbe_default",
 )
@@ -72,6 +71,7 @@ rbe_autoconfig(
 load("@bazel_toolchains//rules:environments.bzl", "clang_env")
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 
+# Create sanitizer (msan, ubsan) toolchain configuration for remote execution.
 rbe_autoconfig(
     name = "rbe_msan",
     env = dicts.add(
diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc
index 9eeeae4dcfb..fb74af04a7f 100644
--- a/tools/remote_build/rbe_common.bazelrc
+++ b/tools/remote_build/rbe_common.bazelrc
@@ -85,7 +85,3 @@ build:ubsan --copt=-gmlt
 build:ubsan --test_timeout=3600
 # override the config-agnostic crosstool_top
 build:ubsan --crosstool_top=@rbe_ubsan//cc:toolchain
-# TODO(jtattermusch): remove this once Foundry adds the env to the docker image.
-# ubsan needs symbolizer to work properly, otherwise the suppression file doesn't work
-# and we get test failures.
-build:ubsan --action_env=UBSAN_SYMBOLIZER_PATH=/usr/local/bin/llvm-symbolizer