diff --git a/java/org/apache/catalina/Manager.java b/java/org/apache/catalina/Manager.java
index ed52490b332a..4053efd62c8e 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -213,21 +213,7 @@ public interface Manager {
      * @return  The new session ID
      */
     default String rotateSessionId(Session session) {
-        String newSessionId = null;
-        // Assume the new Id is a duplicate until we prove it isn't. The
-        // chances of a duplicate are extremely low but the current ManagerBase
-        // code protects against duplicates so this default method does too.
-        boolean duplicate = true;
-        do {
-            newSessionId = getSessionIdGenerator().generateSessionId();
-            try {
-                if (findSession(newSessionId) == null) {
-                    duplicate = false;
-                }
-            } catch (IOException ioe) {
-                // Swallow. An IOE means the ID was known so continue looping
-            }
-        } while (duplicate);
+        String newSessionId = getSessionIdGenerator().generateSessionId();
         changeSessionId(session, newSessionId);
         return newSessionId;
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 472c2ff1d1f5..e764aed74761 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -150,12 +150,17 @@
         Add periodic checking for WebDAV locks expiration. (remm)
       </fix>
       <fix>
-        Extend <code>Asn1Parser</code> to parse <code>UTF8String</code>s. (michaelo)
+        Extend <code>Asn1Parser</code> to parse <code>UTF8String</code>s.
+        (michaelo)
       </fix>
       <fix>
         Remove MBean metadata for attibutes that have been removed. Based on
         <pr>719</pr> by Shawn Q. (markt)
       </fix>
+      <scode>
+        Remove duplicate ID check from <code>Manager.rotateSessionId()</code>.
+        (markt)
+      </scode>
     </changelog>
   </subsection>
   <subsection name="Coyote">