Automated rollback of changelist 305940483

PiperOrigin-RevId: 305944892

2 files changed, 3 insertions, 9 deletions

diff --git a/BUILD b/BUILD
index 42ec54d37..a709a9816 100644
--- a/BUILD
+++ b/BUILD
@@ -97,7 +97,7 @@ platform(
     remote_execution_properties = """
         properties: {
           name: "container-image"
-          value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:5464e3e83dc656fc6e4eae6a01f5c2645f1f7e95854b3802b85e86484132d90e"
+          value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:93f7e127196b9b653d39830c50f8b05d49ef6fd8739a9b5b8ab16e1df5399e50"
         }
         properties: {
           name: "dockerAddCapabilities"
@@ -110,15 +110,12 @@ platform(
     """,
 )
 
-# Bazel version on RBE must by in sync with version on Kokoro.
-# LINT.IfChange
 toolchain(
     name = "cc-toolchain-clang-x86_64-default",
     exec_compatible_with = [
     ],
     target_compatible_with = [
     ],
-    toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/cc:cc-compiler-k8",
+    toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_2.0.0/cc:cc-compiler-k8",
     toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
 )
-# LINT.ThenChange(tools/images/ubuntu1604/20_bazel.sh)
diff --git a/tools/images/ubuntu1604/20_bazel.sh b/tools/images/ubuntu1604/20_bazel.sh
index 5f668884d..bb7afa676 100755
--- a/tools/images/ubuntu1604/20_bazel.sh
+++ b/tools/images/ubuntu1604/20_bazel.sh
@@ -16,10 +16,7 @@
 
 set -xeo pipefail
 
-# Bazel version on Kokoro must be kept in sync with RBE.
-# LINT.IfChange
-declare -r BAZEL_VERSION=3.0.0
-# LINT.ThenChange(../../../BUILD.opensource)
+declare -r BAZEL_VERSION=2.0.0
 
 # Install bazel dependencies.
 while true; do