diff --git a/WORKSPACE b/WORKSPACE
index 99d368ff917..7cc08e0164a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -16,27 +16,30 @@ load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
 
 closure_repositories()
 
-load("//third_party/toolchains/preconfig/generate:archives.bzl",
-     "bazel_toolchains_archive")
-
-bazel_toolchains_archive()
-
-load(
-    "@bazel_toolchains//repositories:repositories.bzl",
-    bazel_toolchains_repositories = "repositories",
+http_archive(
+    name = "base_images_docker",
+    sha256 = "e2b1b7254270bb7605e814a9dbf6d1e4ae04a11136ff1714fbfdabe3f87f7cf9",
+    strip_prefix = "base-images-docker-12801524f867e657fbb5d1a74f31618aff181ac6",
+    urls = ["https://github.com/GoogleCloudPlatform/base-images-docker/archive/12801524f867e657fbb5d1a74f31618aff181ac6.tar.gz"],
 )
 
-bazel_toolchains_repositories()
-
-load(
-    "@io_bazel_rules_docker//container:container.bzl",
-    container_repositories = "repositories",
+http_archive(
+    name = "bazel_toolchains",
+    sha256 = "15b5858b1b5541ec44df31b94c3b8672815b31d71215a98398761ea9f4c4eedb",
+    strip_prefix = "bazel-toolchains-6200b238c9c2d137c0d9a7262c80cc71d98e692b",
+    urls = [
+        "https://github.com/bazelbuild/bazel-toolchains/archive/6200b238c9c2d137c0d9a7262c80cc71d98e692b.tar.gz",
+    ],
 )
 
-container_repositories()
+http_archive(
+    name = "io_bazel_rules_docker",
+    sha256 = "29d109605e0d6f9c892584f07275b8c9260803bf0c6fcb7de2623b2bedc910bd",
+    strip_prefix = "rules_docker-0.5.1",
+    urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.5.1.tar.gz"],
+)
 
-load("//third_party/toolchains/preconfig/generate:workspace.bzl",
-     "remote_config_workspace")
+load("//third_party/toolchains/preconfig/generate:workspace.bzl", "remote_config_workspace")
 
 remote_config_workspace()
 
diff --git a/tensorflow/opensource_only.files b/tensorflow/opensource_only.files
index 418ef1a369a..347dc9fc6b9 100644
--- a/tensorflow/opensource_only.files
+++ b/tensorflow/opensource_only.files
@@ -49,7 +49,6 @@ tensorflow/third_party/toolchains/preconfig/ubuntu14.04/nccl2/BUILD
 tensorflow/third_party/toolchains/preconfig/generate/workspace.bzl
 tensorflow/third_party/toolchains/preconfig/generate/containers.bzl
 tensorflow/third_party/toolchains/preconfig/generate/generate.bzl
-tensorflow/third_party/toolchains/preconfig/generate/archives.bzl
 tensorflow/third_party/toolchains/preconfig/generate/BUILD
 tensorflow/third_party/toolchains/preconfig/win_1803/bazel_018/BUILD
 tensorflow/third_party/toolchains/preconfig/win_1803/bazel_018/dummy_toolchain.bzl
diff --git a/tensorflow/version_check.bzl b/tensorflow/version_check.bzl
index 74feaa19ff1..3b61827139e 100644
--- a/tensorflow/version_check.bzl
+++ b/tensorflow/version_check.bzl
@@ -48,5 +48,3 @@ def check_bazel_version_at_least(minimum_bazel_version):
             native.bazel_version,
             minimum_bazel_version,
         ))
-
-parse_bazel_version = _parse_bazel_version
diff --git a/third_party/toolchains/preconfig/generate/archives.bzl b/third_party/toolchains/preconfig/generate/archives.bzl
deleted file mode 100644
index 086b75b62e6..00000000000
--- a/third_party/toolchains/preconfig/generate/archives.bzl
+++ /dev/null
@@ -1,25 +0,0 @@
-load("//tensorflow:version_check.bzl", "parse_bazel_version")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-def bazel_toolchains_archive():
-  if parse_bazel_version(native.bazel_version) >= parse_bazel_version("0.19"):
-    # This version of the toolchains repo is incompatible with older bazel
-    # versions - we can remove this once TensorFlow drops support for bazel
-    # before 0.19.
-    http_archive(
-        name = "bazel_toolchains",
-        sha256 = "41c48a189be489e2d15dec40e0057ea15b95ee5b39cc2a7e6cf663e31432c75e",
-        strip_prefix = "bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea",
-        urls = [
-            "https://github.com/nlopezgi/bazel-toolchains/archive/3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz",
-        ],
-    )
-  else:
-    http_archive(
-        name = "bazel_toolchains",
-        sha256 = "15b5858b1b5541ec44df31b94c3b8672815b31d71215a98398761ea9f4c4eedb",
-        strip_prefix = "bazel-toolchains-6200b238c9c2d137c0d9a7262c80cc71d98e692b",
-        urls = [
-            "https://github.com/bazelbuild/bazel-toolchains/archive/6200b238c9c2d137c0d9a7262c80cc71d98e692b.tar.gz",
-        ],
-    )
diff --git a/third_party/toolchains/preconfig/generate/generate.bzl b/third_party/toolchains/preconfig/generate/generate.bzl
index fb2af02a539..2fb3a94cdca 100644
--- a/third_party/toolchains/preconfig/generate/generate.bzl
+++ b/third_party/toolchains/preconfig/generate/generate.bzl
@@ -36,7 +36,9 @@ def _tensorflow_rbe_config(name, cuda_version, cudnn_version, python_version, co
             "TF_NCCL_VERSION": "2",
             "CUDNN_INSTALL_PATH": "/usr/lib/x86_64-linux-gnu",
         },
-        mount_project = "$(mount_project)",
+        # TODO(klimek): We should use the sources that we currently work on, not
+        # just the latest snapshot of tensorflow that is checked in.
+        git_repo = "https://github.com/tensorflow/tensorflow",
         tags = ["manual"],
         incompatible_changes_off = True,
     )
diff --git a/third_party/toolchains/preconfig/generate/generate.sh b/third_party/toolchains/preconfig/generate/generate.sh
index 1f39fcdf6d7..37c5211278a 100755
--- a/third_party/toolchains/preconfig/generate/generate.sh
+++ b/third_party/toolchains/preconfig/generate/generate.sh
@@ -46,7 +46,7 @@ echo "CUDA: ${CUDA_VERSION}"
 echo "CUDNN: ${CUDNN_VERSION}"
 echo "NCCL: ${NCCL_VERSION}"
 
-bazel build --define=mount_project="${PWD}" "${PKG}/generate:${TARGET}"
+bazel build "${PKG}/generate:${TARGET}"
 cd "${TEMPDIR}"
 tar xvf "${ROOT}/bazel-bin/${PKG}/generate/${TARGET}_outputs.tar"