diff --git a/common.json b/common.json
index 92f28aea46a2..c1c820f38849 100644
--- a/common.json
+++ b/common.json
@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+2-33", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+2-38", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
index 9a2a6d699a6e..709bebde4abf 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
@@ -198,11 +198,6 @@ private Class<?> defineClass0(String name, byte[] b, int off, int len, ClassLoad
 
 @TargetClass(jdk.internal.access.SharedSecrets.class)
 final class Target_jdk_internal_access_SharedSecrets {
-    @Substitute
-    private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
-        return null;
-    }
-
     /**
      * The JavaIOAccess implementation installed by the class initializer of java.io.Console
      * captures state like "is a tty". The only way to remove such state is by resetting the field.
@@ -215,10 +210,6 @@ private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
 final class Target_jdk_internal_access_JavaIOAccess {
 }
 
-@TargetClass(jdk.internal.access.JavaAWTAccess.class)
-final class Target_jdk_internal_access_JavaAWTAccess {
-}
-
 @TargetClass(className = "sun.reflect.misc.MethodUtil")
 final class Target_sun_reflect_misc_MethodUtil {
     @Substitute