diff --git a/configs/debian8_clang/BUILD b/configs/debian8_clang/BUILD
index 5892a7a..410c2eb 100644
--- a/configs/debian8_clang/BUILD
+++ b/configs/debian8_clang/BUILD
@@ -580,9 +580,6 @@
     base = "@debian8-clang//image",
     bazel_version = "0.22.0",
     env = clang_env(),
-    # TODO (smukherj1): Disable this. Needed to generate configs for Bazel
-    # 0.22.0.
-    incompatible_changes_off = True,
     keys = debian8_clang_default_keys(),
     packages = debian8_clang_default_packages(),
     tags = ["manual"],
@@ -605,9 +602,6 @@
             "BAZEL_LINKOPTS": "-lc++:-lc++abi:-lm",
         },
     ),
-    # TODO (smukherj1): Disable this. Needed to generate configs for Bazel
-    # 0.22.0.
-    incompatible_changes_off = True,
     keys = debian8_clang_default_keys(),
     packages = debian8_clang_default_packages(),
     tags = ["manual"],
diff --git a/configs/ubuntu16_04_clang/BUILD b/configs/ubuntu16_04_clang/BUILD
index e2bb6d4..fab696a 100644
--- a/configs/ubuntu16_04_clang/BUILD
+++ b/configs/ubuntu16_04_clang/BUILD
@@ -454,9 +454,6 @@
     base = "@ubuntu16_04-clang//image",
     bazel_version = "0.22.0",
     env = clang_env(),
-    # TODO (smukherj1): Disable this. Needed to generate configs for Bazel
-    # 0.22.0.
-    incompatible_changes_off = True,
     keys = ubuntu16_04_clang_default_keys(),
     packages = ubuntu16_04_clang_default_packages(),
     tags = ["manual"],
@@ -479,9 +476,6 @@
             "BAZEL_LINKOPTS": "-lc++:-lc++abi:-lm",
         },
     ),
-    # TODO (smukherj1): Disable this. Needed to generate configs for Bazel
-    # 0.22.0.
-    incompatible_changes_off = True,
     keys = ubuntu16_04_clang_default_keys(),
     packages = ubuntu16_04_clang_default_packages(),
     tags = ["manual"],
diff --git a/release/cc/default.tpl b/release/cc/default.tpl
index 160ecb6..a7638b8 100644
--- a/release/cc/default.tpl
+++ b/release/cc/default.tpl
@@ -14,7 +14,4 @@
     packages = ${DISTRO}_clang_default_packages(),
     tags = ["manual"],
     test = True,
-    # TODO (smukherj1): Disable this. Needed to generate configs for Bazel
-    # 0.22.0.
-    incompatible_changes_off = True,
 )
diff --git a/release/cc/msan.tpl b/release/cc/msan.tpl
index 68dc77c..20efe05 100644
--- a/release/cc/msan.tpl
+++ b/release/cc/msan.tpl
@@ -16,7 +16,4 @@
     packages = ${DISTRO}_clang_default_packages(),
     tags = ["manual"],
     test = True,
-    # TODO (smukherj1): Disable this. Needed to generate configs for Bazel
-    # 0.22.0.
-    incompatible_changes_off = True,
 )
diff --git a/rules/docker_config.bzl b/rules/docker_config.bzl
index b9f3ecf..4a0ce04 100644
--- a/rules/docker_config.bzl
+++ b/rules/docker_config.bzl
@@ -223,10 +223,7 @@
 
     # For each config repo we run the target @<config_repo>//...
     bazel_targets = "@" + "//... @".join(ctx.attr.config_repos) + "//..."
-    bazel_flags = ""
-    if not ctx.attr.incompatible_changes_off:
-        bazel_flags += " --all_incompatible_changes"
-    bazel_cmd += " && bazel build " + bazel_flags + " " + bazel_targets
+    bazel_cmd += " && bazel build " + bazel_targets
 
     # Command to run to clean up after autoconfiguration.
     # we start with "cd ." to make sure in case of failure everything after the
@@ -289,7 +286,7 @@
            "> docker run -it {mount_flags} <image_id> bash\n" +
            "Where <image_id> is the image id printed out by the " +
            "{name}_extract.tar rule.\n" +
-           "Then run:\n>/ {run_cmd}\n" +
+           "Then run:\n>/{run_cmd}\n" +
            "from inside the container.").format(
         mount_flags = " ".join(docker_run_flags),
         name = ctx.attr.name,
@@ -323,7 +320,6 @@
         "bazel_version": attr.string(),
         "config_repos": attr.string_list(default = ["local_config_cc"]),
         "git_repo": attr.string(),
-        "incompatible_changes_off": attr.bool(default = False),
         "keys": attr.string_list(),
         "mount_project": attr.string(),
         "packages": attr.string_list(),
@@ -451,8 +447,6 @@
       additional_repos: list of additional debian package repos to use,
           in sources.list format.
       keys: list of additional gpg keys to use while downloading packages.
-      incompatible_changes_off: If True Bazel will run without the
-          all_incompatible_changes flag. Default False.
       test: a boolean which specifies whether a test target for this
           docker_toolchain_autoconfig will be added.
           If True, a test target with name {name}_test will be added.
diff --git a/rules/rbe_repo.bzl b/rules/rbe_repo.bzl
index 03dcf59..2ea33f2 100644
--- a/rules/rbe_repo.bzl
+++ b/rules/rbe_repo.bzl
@@ -452,10 +452,7 @@
 
     # For each config repo we run the target @<config_repo>//...
     bazel_targets = "@" + "//... @".join(_CONFIG_REPOS) + "//..."
-    bazel_flags = ""
-    if not ctx.attr.incompatible_changes_off:
-        bazel_flags += " --all_incompatible_changes"
-    bazel_cmd += " && bazel build " + bazel_flags + " " + bazel_targets
+    bazel_cmd += " && bazel build " + bazel_targets
 
     # Command to run to clean up after autoconfiguration.
     # we start with "cd ." to make sure in case of failure everything after the
@@ -645,11 +642,6 @@
                    "example, [\"@bazel_tools//platforms:linux\"]. Default " +
                    " is set to values for rbe-ubuntu16-04 container."),
         ),
-        "incompatible_changes_off": attr.bool(
-            default = True,
-            doc = ("If set to False the flag --all_incompatible_changes will " +
-                   "be used when generating the toolchain configs."),
-        ),
         "java_home": attr.string(
             doc = ("Optional. The location of java_home in the container. " +
                    "For example, '/usr/lib/jvm/java-8-openjdk-amd64'. If " +
diff --git a/tests/config/BUILD b/tests/config/BUILD
index 2f8fb2f..6a8da22 100644
--- a/tests/config/BUILD
+++ b/tests/config/BUILD
@@ -34,7 +34,6 @@
     name = "ubuntu-xenial-autoconfig",
     base = "//tests/container:rbe-test-xenial-with-pkgs.tar",
     env = gcc_env(),
-    incompatible_changes_off = True,
     tags = ["manual"],
     test = True,
 )
@@ -48,7 +47,6 @@
     ],
     env = gcc_env(),
     git_repo = "https://github.com/bazelbuild/bazel",
-    incompatible_changes_off = True,
     tags = ["manual"],
     test = True,
 )
@@ -65,7 +63,6 @@
         "local_config_cc",
     ],
     env = gcc_env(),
-    incompatible_changes_off = True,
     mount_project = "$(mount_project)",
     tags = ["manual"],
     test = True,