diff --git a/api/controller/sysroot.py b/api/controller/sysroot.py
index c55e757..832aa91 100644
--- a/api/controller/sysroot.py
+++ b/api/controller/sysroot.py
@@ -154,10 +154,8 @@
   """Install packages into a sysroot, building as necessary and permitted."""
   compile_source = (
       input_proto.flags.compile_source or input_proto.flags.toolchain_changed)
-  # A new toolchain version will not yet have goma support, so goma must be
-  # disabled when we are testing toolchain changes.
-  use_goma = (
-      input_proto.flags.use_goma and not input_proto.flags.toolchain_changed)
+  # Testing if Goma will support unknown compilers now.
+  use_goma = input_proto.flags.use_goma
 
   target_sysroot = sysroot_lib.Sysroot(input_proto.sysroot.path)
   build_target = controller_util.ParseBuildTarget(