 index 09fcad95a2..9b737e5deb 100644
 --- a/bazel/grpc_extra_deps.bzl
 +++ b/bazel/grpc_extra_deps.bzl
-@@ -13,14 +13,8 @@
+@@ -13,14 +13,9 @@
  # limitations under the License.
  """Loads the dependencies necessary for the external repositories defined in grpc_deps.bzl."""
 
 -load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 -load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
 -load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
--load("@com_envoyproxy_protoc_gen_validate//:dependencies.bzl", "go_third_party")
+ load("@com_envoyproxy_protoc_gen_validate//:dependencies.bzl", "go_third_party")
  load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
  load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 -load("@envoy_api//bazel:repositories.bzl", "api_dependencies")

 load("@upb//bazel:workspace_deps.bzl", "upb_deps")

 def grpc_extra_deps(ignore_version_differences = False):
@@ -50,20 +44,6 @@

     upb_deps()


diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index 7bb6b8bdb9..7644107b70 100644
--- a/bazel/grpc_build_system.bzl
