diff --git a/examples/experimental_cc_shared_library.bzl b/examples/experimental_cc_shared_library.bzl
index a95fc3b..e660742 100644
--- a/examples/experimental_cc_shared_library.bzl
+++ b/examples/experimental_cc_shared_library.bzl
@@ -279,28 +279,17 @@
 
     linking_context = _create_linker_context(ctx, linker_inputs)
 
-    # TODO(plf): Decide whether ctx.attr.user_link_flags should come before or after options
-    # added by the rule logic.
     user_link_flags = []
-    additional_inputs = []
-    if ctx.file.visibility_file != None:
-        user_link_flags.append(
-            "-Wl,--version-script=" + ctx.file.visibility_file.path,
-        )
-        additional_inputs = [ctx.file.visibility_file]
-
     for user_link_flag in ctx.attr.user_link_flags:
         user_link_flags.append(ctx.expand_location(user_link_flag, targets = ctx.attr.additional_linker_inputs))
 
-    additional_inputs.extend(ctx.files.additional_linker_inputs)
-
     linking_outputs = cc_common.link(
         actions = ctx.actions,
         feature_configuration = feature_configuration,
         cc_toolchain = cc_toolchain,
         linking_contexts = [linking_context],
         user_link_flags = user_link_flags,
-        additional_inputs = additional_inputs,
+        additional_inputs = ctx.files.additional_linker_inputs,
         name = ctx.label.name,
         output_type = "dynamic_library",
     )
@@ -374,7 +363,6 @@
         "preloaded_deps": attr.label_list(providers = [CcInfo]),
         "static_deps": attr.string_list(),
         "user_link_flags": attr.string_list(),
-        "visibility_file": attr.label(allow_single_file = True),
         "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"),
     },
     toolchains = ["@rules_cc//cc:toolchain_type"],  # copybara-use-repo-external-label
diff --git a/examples/test_cc_shared_library/BUILD b/examples/test_cc_shared_library/BUILD
index 875390b..e860b5c 100644
--- a/examples/test_cc_shared_library/BUILD
+++ b/examples/test_cc_shared_library/BUILD
@@ -18,7 +18,10 @@
 
 cc_shared_library(
     name = "foo_so",
-    additional_linker_inputs = [":additional_script.txt"],
+    additional_linker_inputs = [
+        ":foo.lds",
+        ":additional_script.txt",
+    ],
     dynamic_deps = ["bar_so"],
     preloaded_deps = ["preloaded_dep"],
     static_deps = [
@@ -26,9 +29,9 @@
     ],
     user_link_flags = [
         "-Wl,-rpath,kittens",
+        "-Wl,--version-script=$(location :foo.lds)",
         "-Wl,--script=$(location :additional_script.txt)",
     ],
-    visibility_file = "foo.lds",
     exports = [
         "foo",
         # Not a problem to export "baz" which is depended on by foo
@@ -82,11 +85,16 @@
 
 cc_shared_library(
     name = "bar_so",
+    additional_linker_inputs = [
+        ":bar.lds",
+    ],
     static_deps = [
         "//examples/test_cc_shared_library:barX",
         "@test_repo//:bar",
     ],
-    visibility_file = "bar.lds",
+    user_link_flags = [
+        "-Wl,--version-script=$(location :bar.lds)",
+    ],
     exports = [
         "bar",
         "bar2",