diff --git a/src/java.base/share/classes/java/util/Objects.java b/src/java.base/share/classes/java/util/Objects.java
index 885a8891343..d80208fa9cc 100644
--- a/src/java.base/share/classes/java/util/Objects.java
+++ b/src/java.base/share/classes/java/util/Objects.java
@@ -26,7 +26,6 @@
 package java.util;
 
 import jdk.internal.javac.PreviewFeature;
-import jdk.internal.misc.PreviewFeatures;
 import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.ForceInline;
 
@@ -62,12 +61,7 @@ private Objects() {
      */
     @ForceInline
     public static boolean equals(Object a, Object b) {
-        if (PreviewFeatures.isEnabled()) {
-            // With --enable-preview avoid acmp
-            return (a == null) ? b == null : a.equals(b);
-        } else {
-            return (a == b) || (a != null && a.equals(b));
-        }
+        return (a == b) || (a != null && a.equals(b));
     }
 
    /**
diff --git a/test/jdk/java/io/Serializable/valueObjects/SimpleValueGraphs.java b/test/jdk/java/io/Serializable/valueObjects/SimpleValueGraphs.java
index dba4a6ebbdb..30d27b11452 100644
--- a/test/jdk/java/io/Serializable/valueObjects/SimpleValueGraphs.java
+++ b/test/jdk/java/io/Serializable/valueObjects/SimpleValueGraphs.java
@@ -235,9 +235,9 @@ public SimpleValue(Serializable o, int i) {
             this.i = i;
         }
 
-        public boolean equals(Object obj) {
-            if (obj instanceof SimpleValue simpleValue) {
-                return (i == simpleValue.i && Objects.equals(this.obj, simpleValue.obj));
+        public boolean equals(Object other) {
+            if (other instanceof SimpleValue simpleValue) {
+                return (i == simpleValue.i && Objects.equals(obj, simpleValue.obj));
             }
             return false;
         }