diff --git a/ocaml-dockerfile b/ocaml-dockerfile
index 60eb31d..5d97ac0 160000
--- a/ocaml-dockerfile
+++ b/ocaml-dockerfile
@@ -1 +1 @@
-Subproject commit 60eb31dbea462ca993fa971ae62dc00443027eac
+Subproject commit 5d97ac0f723064b7a14e9bf6e7cc3cb39dd4a93d
diff --git a/ocluster b/ocluster
index 513c170..222011c 160000
--- a/ocluster
+++ b/ocluster
@@ -1 +1 @@
-Subproject commit 513c17095fa97f3418970180cd72de880869c292
+Subproject commit 222011c2ef5100f9ed43234c59d215dc2430bfca
diff --git a/ocurrent b/ocurrent
index 5661fe2..10c8c4c 160000
--- a/ocurrent
+++ b/ocurrent
@@ -1 +1 @@
-Subproject commit 5661fe2848c586efa3c7d82c39fa0d0a7a5e5c53
+Subproject commit 10c8c4c41dac1cfc62281f39a3694ec3dbcf08ae
diff --git a/service/service.ml b/service/service.ml
index 4c2a773..91a111c 100644
--- a/service/service.ml
+++ b/service/service.ml
@@ -111,20 +111,11 @@ module Make (Opam_repo : Opam_repository_intf.S) = struct
           | _ -> Fmt.failwith "BUG: bad output: %s" results)
 
     let ocaml = OpamPackage.Name.of_string "ocaml"
-    let base_effects = OpamPackage.Name.of_string "base-effects"
-    let base_domains = OpamPackage.Name.of_string "base-domains"
-
-    let is_multicore ocaml_version =
-      let v =
-        Ocaml_version.of_string_exn
-          (OpamPackage.Version.to_string ocaml_version)
-      in
-      Ocaml_version.Configure_options.is_multicore v
 
     (* If a local package has a literal constraint on OCaml's version and it doesn't match
        the platform, we just remove that package from the set to test, so other packages
-       can still be tested. If it depends on base-effects or base-domains, require a multicore compiler. *)
-    let compatible_with ~log ~ocaml_version (dep_name, filter) =
+       can still be tested. *)
+    let compatible_with ~ocaml_version (dep_name, filter) =
       let check_ocaml = function
         | OpamTypes.Constraint (op, OpamTypes.FString v) ->
             let v = OpamPackage.Version.of_string v in
@@ -133,16 +124,6 @@ module Make (Opam_repo : Opam_repository_intf.S) = struct
       in
       if OpamPackage.Name.equal dep_name ocaml then
         OpamFormula.eval check_ocaml filter
-      else if
-        OpamPackage.Name.equal dep_name base_effects
-        || OpamPackage.Name.equal dep_name base_domains
-      then (
-        try is_multicore ocaml_version
-        with ex ->
-          Log.info log "is_multicore %S failed: %a"
-            (OpamPackage.Version.to_string ocaml_version)
-            Fmt.exn ex;
-          false)
       else true
 
     let handle ~log request t =
@@ -176,9 +157,7 @@ module Make (Opam_repo : Opam_repository_intf.S) = struct
                       else
                         let opam = OpamFile.OPAM.read_from_string contents in
                         let deps = OpamFile.OPAM.depends opam in
-                        OpamFormula.eval
-                          (compatible_with ~log ~ocaml_version)
-                          deps)
+                        OpamFormula.eval (compatible_with ~ocaml_version) deps)
              in
              (* If some packages are compatible but some aren't, just solve for the compatible ones.
                 Otherwise, try to solve for everything to get a suitable error. *)