diff --git a/scala_proto/BUILD b/scala_proto/BUILD
index a7c0bc0c9..6bd4929c1 100644
--- a/scala_proto/BUILD
+++ b/scala_proto/BUILD
@@ -1,6 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
 load("//scala_proto:scala_proto_toolchain.bzl", "scala_proto_toolchain")
-load("//scala_proto:default_dep_sets.bzl", "DEFAULT_SCALAPB_COMPILE_DEPS", "DEFAULT_SCALAPB_GRPC_DEPS")
 
 toolchain_type(
     name = "toolchain_type",
@@ -37,15 +36,3 @@ toolchain(
     toolchain_type = "@io_bazel_rules_scala//scala_proto:toolchain_type",
     visibility = ["//visibility:public"],
 )
-
-java_library(
-    name = "default_scalapb_compile_dependencies",
-    visibility = ["//visibility:public"],
-    exports = DEFAULT_SCALAPB_COMPILE_DEPS,
-)
-
-java_library(
-    name = "default_scalapb_grpc_dependencies",
-    visibility = ["//visibility:public"],
-    exports = DEFAULT_SCALAPB_GRPC_DEPS,
-)
diff --git a/scala_proto/private/scalapb_aspect.bzl b/scala_proto/private/scalapb_aspect.bzl
index db09d4d86..18f097c18 100644
--- a/scala_proto/private/scalapb_aspect.bzl
+++ b/scala_proto/private/scalapb_aspect.bzl
@@ -141,11 +141,11 @@ def _scalapb_aspect_impl(target, ctx):
 
         toolchain = ctx.toolchains["@io_bazel_rules_scala//scala_proto:toolchain_type"]
         flags = []
-        imps = [j[JavaInfo] for j in ctx.attr._implicit_compile_deps]
+        imps = [j[JavaInfo] for j in toolchain.implicit_compile_deps]
 
         if toolchain.with_grpc:
             flags.append("grpc")
-            imps.extend([j[JavaInfo] for j in ctx.attr._grpc_deps])
+            imps.extend([j[JavaInfo] for j in toolchain.grpc_deps])
 
         if toolchain.with_flat_package:
             flags.append("flat_package")
@@ -234,12 +234,6 @@ scalapb_aspect = aspect(
     ],
     attrs = {
         "_protoc": attr.label(executable = True, cfg = "host", default = "@com_google_protobuf//:protoc"),
-        "_implicit_compile_deps": attr.label_list(cfg = "target", default = [
-            "//external:io_bazel_rules_scala/dependency/proto/implicit_compile_deps",
-        ]),
-        "_grpc_deps": attr.label_list(cfg = "target", default = [
-            "//external:io_bazel_rules_scala/dependency/proto/grpc_deps",
-        ]),
     },
     toolchains = [
         "@io_bazel_rules_scala//scala:toolchain_type",
diff --git a/scala_proto/scala_proto.bzl b/scala_proto/scala_proto.bzl
index 2dd296f86..1e4b2f209 100644
--- a/scala_proto/scala_proto.bzl
+++ b/scala_proto/scala_proto.bzl
@@ -19,24 +19,10 @@ load(
     "scalapb_aspect",
 )
 
-def register_default_proto_dependencies():
-    if native.existing_rule("io_bazel_rules_scala/dependency/proto/grpc_deps") == None:
-        native.bind(
-            name = "io_bazel_rules_scala/dependency/proto/grpc_deps",
-            actual = "@io_bazel_rules_scala//scala_proto:default_scalapb_grpc_dependencies",
-        )
-
-    if native.existing_rule("io_bazel_rules_scala/dependency/proto/implicit_compile_deps") == None:
-        native.bind(
-            name = "io_bazel_rules_scala/dependency/proto/implicit_compile_deps",
-            actual = "@io_bazel_rules_scala//scala_proto:default_scalapb_compile_dependencies",
-        )
-
 def scala_proto_repositories(
         scala_version = _default_scala_version(),
         maven_servers = _default_maven_server_urls()):
     ret = scala_proto_default_repositories(scala_version, maven_servers)
-    register_default_proto_dependencies()
     return ret
 
 def _scala_proto_library_impl(ctx):
diff --git a/scala_proto/scala_proto_toolchain.bzl b/scala_proto/scala_proto_toolchain.bzl
index d13aa2b47..70f0c6864 100644
--- a/scala_proto/scala_proto_toolchain.bzl
+++ b/scala_proto/scala_proto_toolchain.bzl
@@ -8,6 +8,8 @@ def _scala_proto_toolchain_impl(ctx):
         blacklisted_protos = ctx.attr.blacklisted_protos,
         code_generator = ctx.attr.code_generator,
         extra_generator_dependencies = ctx.attr.extra_generator_dependencies,
+        grpc_deps=ctx.attr.grpc_deps,
+        implicit_compile_deps=ctx.attr.implicit_compile_deps,
         scalac = ctx.attr.scalac,
         named_generators = ctx.attr.named_generators,
     )
@@ -36,6 +38,16 @@ scala_proto_toolchain = rule(
         "extra_generator_dependencies": attr.label_list(
             providers = [JavaInfo],
         ),
+        "grpc_deps": attr.label_list(
+            providers = [JavaInfo],
+            default = DEFAULT_SCALAPB_GRPC_DEPS,
+            cfg = "target"
+        ),
+        "implicit_compile_deps": attr.label_list(
+            providers = [JavaInfo],
+            default = DEFAULT_SCALAPB_COMPILE_DEPS,
+            cfg = "target"
+        ),
         "scalac": attr.label(
             default = Label(
                 "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac",