diff --git a/bazel/upb_proto_library.bzl b/bazel/upb_proto_library.bzl
index 6612ee8907..ea2d2faab3 100644
--- a/bazel/upb_proto_library.bzl
+++ b/bazel/upb_proto_library.bzl
@@ -133,11 +133,6 @@ def _cc_library_func(ctx, name, hdrs, srcs, copts, includes, dep_ccinfos):
         unsupported_features = ctx.disabled_features,
     )
 
-    blaze_only_args = {}
-
-    if _is_google3:
-        blaze_only_args["grep_includes"] = ctx.file._grep_includes
-
     (compilation_context, compilation_outputs) = cc_common.compile(
         actions = ctx.actions,
         feature_configuration = feature_configuration,
@@ -148,7 +143,6 @@ def _cc_library_func(ctx, name, hdrs, srcs, copts, includes, dep_ccinfos):
         public_hdrs = hdrs,
         user_compile_flags = copts,
         compilation_contexts = compilation_contexts,
-        **blaze_only_args
     )
 
     # buildifier: disable=unused-variable
@@ -160,7 +154,6 @@ def _cc_library_func(ctx, name, hdrs, srcs, copts, includes, dep_ccinfos):
         compilation_outputs = compilation_outputs,
         linking_contexts = linking_contexts,
         disallow_dynamic_library = cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "targets_windows"),
-        **blaze_only_args
     )
 
     return CcInfo(
diff --git a/protos/bazel/upb_cc_proto_library.bzl b/protos/bazel/upb_cc_proto_library.bzl
index 0c65018edb..d6b996997e 100644
--- a/protos/bazel/upb_cc_proto_library.bzl
+++ b/protos/bazel/upb_cc_proto_library.bzl
@@ -112,11 +112,6 @@ def _cc_library_func(ctx, name, hdrs, srcs, copts, dep_ccinfos):
         unsupported_features = ctx.disabled_features,
     )
 
-    blaze_only_args = {}
-
-    if _is_google3:
-        blaze_only_args["grep_includes"] = ctx.file._grep_includes
-
     (compilation_context, compilation_outputs) = cc_common.compile(
         actions = ctx.actions,
         feature_configuration = feature_configuration,
@@ -126,7 +121,6 @@ def _cc_library_func(ctx, name, hdrs, srcs, copts, dep_ccinfos):
         public_hdrs = hdrs,
         user_compile_flags = copts,
         compilation_contexts = compilation_contexts,
-        **blaze_only_args
     )
 
     # buildifier: disable=unused-variable
@@ -137,7 +131,6 @@ def _cc_library_func(ctx, name, hdrs, srcs, copts, dep_ccinfos):
         cc_toolchain = toolchain,
         compilation_outputs = compilation_outputs,
         linking_contexts = linking_contexts,
-        **blaze_only_args
     )
 
     return CcInfo(