diff --git a/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java b/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java
index 67c96d12644..7746db2bee0 100644
--- a/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java
+++ b/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java
@@ -25,9 +25,6 @@
 
 package java.lang;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
-
 /**
  * A collection of assertion status directives (such as "enable assertions
  * in package p" or "disable assertions in class c").  This class is used by
@@ -38,7 +35,6 @@
  * @since  1.4
  * @author Josh Bloch
  */
-@NullMarked
 class AssertionStatusDirectives {
     /**
      * The classes for which assertions are to be enabled or disabled.
diff --git a/src/java.base/share/classes/java/lang/Shutdown.java b/src/java.base/share/classes/java/lang/Shutdown.java
index bbf75b8662e..36cf471a575 100644
--- a/src/java.base/share/classes/java/lang/Shutdown.java
+++ b/src/java.base/share/classes/java/lang/Shutdown.java
@@ -25,8 +25,6 @@
 
 package java.lang;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
 import jdk.internal.misc.VM;
 
@@ -42,8 +40,7 @@
  * @see java.io.DeleteOnExitHook
  */
 
-@NullMarked
- class Shutdown {
+class Shutdown {
 
     // The system shutdown hooks are registered with a predefined slot.
     // The list of shutdown hooks is as follows:
@@ -52,7 +49,7 @@ class Shutdown {
     //     shutdown hooks and waits until they finish
     // (2) DeleteOnExit hook
     private static final int MAX_SYSTEM_HOOKS = 10;
-    private static final @Nullable Runnable[] hooks = new Runnable[MAX_SYSTEM_HOOKS];
+    private static final Runnable[] hooks = new Runnable[MAX_SYSTEM_HOOKS];
 
     // the index of the currently running shutdown hook to the hooks array
     private static int currentRunningHook = -1;
diff --git a/src/java.base/share/classes/java/text/DigitList.java b/src/java.base/share/classes/java/text/DigitList.java
index 55c3daf13da..fde0e93214a 100644
--- a/src/java.base/share/classes/java/text/DigitList.java
+++ b/src/java.base/share/classes/java/text/DigitList.java
@@ -38,8 +38,6 @@
 
 package java.text;
 
-import org.jspecify.annotations.Nullable;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
@@ -690,9 +688,7 @@ final void set(boolean isNegative, BigInteger source, int maximumDigits) {
     /**
      * equality test between two digit lists.
      */
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj)                      // quick check
             return true;
         if (!(obj instanceof DigitList other))         // (1) same object?
diff --git a/src/java.base/share/classes/java/text/PatternEntry.java b/src/java.base/share/classes/java/text/PatternEntry.java
index 8ae354d9aa6..5486f1c008b 100644
--- a/src/java.base/share/classes/java/text/PatternEntry.java
+++ b/src/java.base/share/classes/java/text/PatternEntry.java
@@ -38,8 +38,6 @@
 
 package java.text;
 
-import org.jspecify.annotations.Nullable;
-
 import java.lang.Character;
 
 /**
@@ -70,9 +68,7 @@ private void appendQuotedChars(StringBuilder toAddTo) {
      * Because Vector.indexOf doesn't take a comparator,
      * this method is ill-defined and ignores strength.
      */
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj == null) return false;
         PatternEntry other = (PatternEntry) obj;
         boolean result = chars.equals(other.chars);
diff --git a/src/java.base/share/classes/java/text/RuleBasedCollationKey.java b/src/java.base/share/classes/java/text/RuleBasedCollationKey.java
index b7a11137587..407f0f9e496 100644
--- a/src/java.base/share/classes/java/text/RuleBasedCollationKey.java
+++ b/src/java.base/share/classes/java/text/RuleBasedCollationKey.java
@@ -38,8 +38,6 @@
 
 package java.text;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * A RuleBasedCollationKey is a concrete implementation of CollationKey class.
  * The RuleBasedCollationKey class is used by the RuleBasedCollator class.
@@ -74,9 +72,7 @@ else if (result >= Collator.GREATER)
      * @param target the RuleBasedCollationKey to compare to.
      * @return Returns true if two objects are equal, false otherwise.
      */
-    
-    
-    public boolean equals(@Nullable Object target) {
+    public boolean equals(Object target) {
         if (this == target) return true;
         if (target == null || !getClass().equals(target.getClass())) {
             return false;
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
index 25f768b9706..412d4845456 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
@@ -61,8 +61,6 @@
  */
 package java.time.chrono;
 
-import org.jspecify.annotations.Nullable;
-
 import static java.time.temporal.ChronoField.EPOCH_DAY;
 
 import java.io.IOException;
@@ -435,9 +433,7 @@ static ChronoLocalDateTime<?> readExternal(ObjectInput in) throws IOException, C
 
     //-----------------------------------------------------------------------
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
index 3650def706f..6a41a132853 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
@@ -56,8 +56,6 @@
  */
 package java.time.chrono;
 
-import org.jspecify.annotations.Nullable;
-
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.MONTHS;
@@ -317,9 +315,7 @@ private void validateChrono(TemporalAccessor temporal) {
 
     //-----------------------------------------------------------------------
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
index 70696bfe1d1..4e0eaf9dc04 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
@@ -61,8 +61,6 @@
  */
 package java.time.chrono;
 
-import org.jspecify.annotations.Nullable;
-
 import static java.time.temporal.ChronoUnit.SECONDS;
 
 import java.io.IOException;
@@ -367,9 +365,7 @@ static ChronoZonedDateTime<?> readExternal(ObjectInput in) throws IOException, C
 
     //-------------------------------------------------------------------------
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
diff --git a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
index 9bda2679fe1..d275b09834a 100644
--- a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
+++ b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
@@ -25,8 +25,6 @@
 
 package java.util;
 
-import org.jspecify.annotations.Nullable;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import sun.util.locale.provider.CalendarDataUtility;
@@ -383,9 +381,7 @@ public String getCalendarType() {
      * @see Calendar#compareTo(Calendar)
      */
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         return obj instanceof JapaneseImperialCalendar &&
             super.equals(obj);
     }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
index 840c7252ef2..29b1325f3e6 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
@@ -25,8 +25,6 @@
 
 package sun.nio.fs;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * Container for device/inode to uniquely identify file.
  */
@@ -47,9 +45,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj == this)
             return true;
         return obj instanceof UnixFileKey other
diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
index 564cac9f183..c19365ef600 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
@@ -25,8 +25,6 @@
 
 package java.awt.datatransfer;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -76,9 +74,7 @@ public int hashCode() {
      * set of parameter names and associated values. The order of the parameters
      * is not considered.
      */
-    
-    
-    public boolean equals(@Nullable Object thatObject) {
+    public boolean equals(Object thatObject) {
         //System.out.println("MimeTypeParameterList.equals("+this+","+thatObject+")");
         if (!(thatObject instanceof MimeTypeParameterList)) {
             return false;
diff --git a/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java b/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java
index 3310b0d571f..28e316c90ec 100644
--- a/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java
+++ b/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java
@@ -24,8 +24,6 @@
  */
 package com.sun.beans;
 
-import org.jspecify.annotations.Nullable;
-
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
 import java.util.Arrays;
@@ -104,9 +102,7 @@ public Type[] getLowerBounds() {
      * @see sun.reflect.generics.reflectiveObjects.WildcardTypeImpl#equals
      */
     @Override
-    
-    
-    public boolean equals(@Nullable Object object) {
+    public boolean equals(Object object) {
         if (object instanceof WildcardType) {
             WildcardType type = (WildcardType) object;
             return Arrays.equals(this.upperBounds, type.getUpperBounds())
diff --git a/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java b/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java
index 06c7a0adafd..dfba13e48f0 100644
--- a/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java
+++ b/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java
@@ -24,8 +24,6 @@
  */
 package com.sun.beans.finder;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * This class is designed to be a key of a cache
  * of constructors or methods.
@@ -85,9 +83,7 @@ Class<?>[] getArgs() {
      * @see #hashCode()
      */
     @Override
-    
-    
-    public boolean equals(@Nullable Object object) {
+    public boolean equals(Object object) {
         if (this == object) {
             return true;
         }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
index 9203f3998ea..365bbffbcc8 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
@@ -24,8 +24,6 @@
  */
 package javax.swing.plaf.nimbus;
 
-import org.jspecify.annotations.Nullable;
-
 import javax.swing.UIManager;
 import java.awt.Color;
 import java.beans.PropertyChangeSupport;
@@ -115,9 +113,7 @@ public void rederiveColor() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof DerivedColor)) return false;
         DerivedColor that = (DerivedColor) o;
diff --git a/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java
index d17d00699dc..2bac67eed18 100644
--- a/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java
+++ b/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java
@@ -25,8 +25,6 @@
 
 package sun.awt.im;
 
-import org.jspecify.annotations.Nullable;
-
 import java.awt.AWTException;
 import java.awt.im.spi.InputMethodDescriptor;
 import java.util.Locale;
@@ -56,9 +54,7 @@ final class InputMethodLocator {
         this.locale = locale;
     }
 
-    
-    
-    public boolean equals(@Nullable Object other) {
+    public boolean equals(Object other) {
         if (other == this) {
             return true;
         }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
index 4f3bf15df17..811a5cf12c9 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
@@ -24,8 +24,6 @@
  */
 package sun.awt.X11;
 
-import org.jspecify.annotations.Nullable;
-
 import java.awt.*;
 
 class WindowDimensions {
@@ -166,9 +164,7 @@ public String toString() {
         return "[" + loc + ", " + size + "(" +(isClientSizeSet?"client":"bounds") + ")+" + insets + "]";
     }
 
-    
-    
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         if (!(o instanceof WindowDimensions)) {
             return false;
         }
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java
index eaa824c1988..20a8cdcf148 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.ldap;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Locale;
 import java.util.Arrays; // JDK 1.2
 import java.io.OutputStream;
@@ -117,9 +115,7 @@ class ClientId {
             + (ctlHash=hashCodeControls(bindCtls));
     }
 
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (!(obj instanceof ClientId)) {
             return false;
         }
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java b/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java
index 556dba7b61a..de5599c8720 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.ldap;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Arrays; // JDK 1.2
 import java.util.Hashtable;
 
@@ -84,9 +82,7 @@ class DigestClientId extends SimpleClientId {
         myHash = super.hashCode() ^ Arrays.hashCode(propvals);
     }
 
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (!(obj instanceof DigestClientId)) {
             return false;
         }
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java b/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java
index c7ac09f5626..81192f4d269 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.ldap;
 
-import org.jspecify.annotations.Nullable;
-
 import javax.naming.directory.SearchControls;
 import javax.naming.event.*;
 
@@ -80,9 +78,7 @@ final class NotifierArgs {
     }
 
     // checks name, filter, controls
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof NotifierArgs) {
             NotifierArgs target = (NotifierArgs)obj;
             return mask == target.mask &&
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java b/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java
index e1afdd948bd..4d975a1f3a2 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java
@@ -24,8 +24,6 @@
  */
 package sun.rmi.transport;
 
-import org.jspecify.annotations.Nullable;
-
 import java.rmi.server.ObjID;
 
 /**
@@ -67,9 +65,7 @@ class ObjectEndpoint {
      * ObjectEndpoint instance with the same object identifier and
      * transport as this object.
      **/
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof ObjectEndpoint) {
             ObjectEndpoint oe = (ObjectEndpoint) obj;
             return id.equals(oe.id) && transport == oe.transport;
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java b/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java
index fe06bdb87b1..50b5856d6e8 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java
@@ -24,8 +24,6 @@
  */
 package sun.rmi.transport;
 
-import org.jspecify.annotations.Nullable;
-
 import java.lang.ref.*;
 import sun.rmi.runtime.Log;
 
@@ -127,9 +125,7 @@ public int hashCode() {
      * contained reference has not been cleared, if "obj" is another WeakRef
      * object with the identical non-null referent.  Otherwise, return false.
      */
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof WeakRef) {
             if (obj == this)
                 return true;
diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java
index 1b2f384c6e9..6e3ca59c0e8 100644
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java
@@ -25,8 +25,6 @@
 
 package javax.security.auth.kerberos;
 
-import org.jspecify.annotations.Nullable;
-
 import java.io.*;
 import java.util.Arrays;
 import javax.crypto.SecretKey;
@@ -241,9 +239,7 @@ public int hashCode() {
         return 37 * result + keyType;
     }
 
-    
-    
-    public boolean equals(@Nullable Object other) {
+    public boolean equals(Object other) {
 
         if (other == this)
             return true;
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
index 01edb135267..087eaeb66dd 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
@@ -21,8 +21,6 @@
 
 package com.sun.org.apache.xalan.internal.xsltc.compiler;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
@@ -59,9 +57,7 @@ public String getStringRep() {
         return _stringRep;
     }
 
-    
-    
-    public boolean equals(@Nullable Object other) {
+    public boolean equals(Object other) {
         return (this == other)
                    || (other instanceof QName
                            && _stringRep.equals(((QName) other).getStringRep()));
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
index 35a8cd7b5dc..a6267113c7f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
@@ -21,8 +21,6 @@
 
 package com.sun.org.apache.xalan.internal.xsltc.compiler;
 
-import org.jspecify.annotations.Nullable;
-
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError;
 import java.util.Objects;
@@ -99,9 +97,7 @@ public void addParentDependency() {
      * same variable.
      */
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         return obj == this || (obj instanceof VariableRefBase)
             && (_variable == ((VariableRefBase) obj)._variable);
     }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
index 522fac5f5d6..0e0abcc26ea 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
@@ -21,8 +21,6 @@
 
 package com.sun.org.apache.xerces.internal.util;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * <p>A structure that represents an error code, characterized by
  * a domain and a message key.</p>
@@ -69,9 +67,7 @@ public void setValues(String domain, String key) {
      *
      * @param obj the object with which to compare.
      */
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (!(obj instanceof XMLErrorCode))
             return false;
         XMLErrorCode err = (XMLErrorCode) obj;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java
index b86933c42ff..9bb14e55266 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java
@@ -24,8 +24,6 @@
 
 package sun.jvm.hotspot.debugger.bsd;
 
-import org.jspecify.annotations.Nullable;
-
 import sun.jvm.hotspot.debugger.*;
 
 class BsdAddress implements Address {
@@ -41,9 +39,7 @@ class BsdAddress implements Address {
     // Basic Java routines
     //
 
-    
-    
-    public boolean equals(@Nullable Object arg) {
+    public boolean equals(Object arg) {
         if (arg == null) {
             return false;
         }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
index 8c97f221010..358441d0b22 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
@@ -22,8 +22,6 @@
  */
 package jdk.vm.ci.hotspot;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Objects;
 
 import jdk.vm.ci.meta.Constant;
@@ -56,9 +54,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         if (o == this) {
             return true;
         }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/NullConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/NullConstant.java
index 92847ae8ee2..3f95674a648 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/NullConstant.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/NullConstant.java
@@ -22,8 +22,6 @@
  */
 package jdk.vm.ci.meta;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * The implementation type of the {@link JavaConstant#NULL_POINTER null constant}.
  */
@@ -93,9 +91,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         return o instanceof NullConstant;
     }
 }
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
index 5d86b690e2c..b2d86f7f9e3 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
@@ -34,8 +34,6 @@
 
 package com.sun.tools.example.debug.tty;
 
-import org.jspecify.annotations.Nullable;
-
 import com.sun.jdi.*;
 import com.sun.jdi.request.*;
 
@@ -118,9 +116,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof BreakpointSpec) {
             BreakpointSpec breakpoint = (BreakpointSpec)obj;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
index 7e32723ec89..dab02d60496 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
@@ -34,8 +34,6 @@
 
 package com.sun.tools.example.debug.tty;
 
-import org.jspecify.annotations.Nullable;
-
 import com.sun.jdi.ReferenceType;
 import com.sun.jdi.request.*;
 
@@ -87,9 +85,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof ExceptionSpec) {
             ExceptionSpec es = (ExceptionSpec)obj;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
index d0a6044673e..0e6f8ab82ff 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
@@ -34,8 +34,6 @@
 
 package com.sun.tools.example.debug.tty;
 
-import org.jspecify.annotations.Nullable;
-
 import com.sun.jdi.*;
 import com.sun.jdi.request.ClassPrepareRequest;
 import java.util.StringTokenizer;
@@ -92,9 +90,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof PatternReferenceTypeSpec) {
             PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
index bfddbe1c330..75658cbddb8 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
@@ -34,8 +34,6 @@
 
 package com.sun.tools.example.debug.tty;
 
-import org.jspecify.annotations.Nullable;
-
 abstract class WatchpointSpec extends EventRequestSpec {
     final String fieldId;
 
@@ -55,9 +53,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof WatchpointSpec) {
             WatchpointSpec watchpoint = (WatchpointSpec)obj;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java
index 257f3310540..218b0bb60fa 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java
@@ -25,8 +25,6 @@
 
 package com.sun.tools.jdi;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -106,9 +104,7 @@ static byte JDItoJDWPSuspendPolicy(int jdiPolicy) {
     /*
      * Override superclass back to default equality
      */
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         return this == obj;
     }
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
index 38904792652..fa051eae278 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
@@ -25,8 +25,6 @@
 
 package com.sun.tools.jdi;
 
-import org.jspecify.annotations.Nullable;
-
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
@@ -302,9 +300,7 @@ void validateVM() {
          */
     }
 
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         return this == obj;
     }
 
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
index 2ab53cc7dc6..53c31c3568d 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
@@ -25,8 +25,6 @@
 
 package jdk.internal.jshell.tool;
 
-import org.jspecify.annotations.Nullable;
-
 import java.nio.file.AccessDeniedException;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -158,9 +156,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         return (o instanceof Startup)
                 && entries.equals(((Startup) o).entries);
     }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java b/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java
index e5cc6ee37f9..015b97bdad6 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java
@@ -25,8 +25,6 @@
 
 package jdk.jshell;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Locale;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
@@ -107,9 +105,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         return (o instanceof OuterWrap)
                 ? className().equals(((OuterWrap) o).className())
                 : false;
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Unit.java b/src/jdk.jshell/share/classes/jdk/jshell/Unit.java
index 507d4d812f1..a6b7b07658e 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Unit.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Unit.java
@@ -25,8 +25,6 @@
 
 package jdk.jshell;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -125,9 +123,7 @@ public int hashCode() {
     }
 
     @Override
-    
-    
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         return (o instanceof Unit)
                 ? si.equals(((Unit) o).si)
                 : false;
diff --git a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java
index 03587f33fe3..490c3151aca 100644
--- a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java
+++ b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.dns;
 
-import org.jspecify.annotations.Nullable;
-
 
 import javax.naming.*;
 
@@ -47,9 +45,7 @@ public Name parse(String name) throws NamingException {
 
     // Every DnsNameParser is created equal.
 
-    
-    
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         return (obj instanceof DnsNameParser);
     }