diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 54022e4e27a..5fc745ba223 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -66,7 +66,7 @@ endif
 #   default classlist is minimal, let's filter out the '@cp' lines until we can
 #   find a proper solution.
 CLASSLIST_FILE_VM_OPTS = \
-    -Duser.language=en -Duser.country=US --enable-native-access=ALL-UNNAMED
+    -Duser.language=en -Duser.country=US
 
 # Save the stderr output of the command and print it along with stdout in case
 # something goes wrong.
diff --git a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
index 9434889e0bb..fa1b33bb03e 100644
--- a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
+++ b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
@@ -31,8 +31,6 @@
  */
 package build.tools.classlist;
 
-import java.lang.foreign.FunctionDescriptor;
-import java.lang.foreign.Linker;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -174,10 +172,6 @@ public class HelloClasslist {
         // an inconsistency in the classlist between builds (see JDK-8295951).
         // To avoid the problem, load the class explicitly.
         Class<?> striped64Class = Class.forName("java.util.concurrent.atomic.Striped64$Cell");
-
-        // Initialize FFM linkers
-        var signature = FunctionDescriptor.ofVoid();
-        Linker.nativeLinker().downcallHandle(signature);
     }
 
     public HelloClasslist() {}