This issue is about removing changes introduced in #20150, since /spring-projects/spring-framework#24466 moved that code snippet up in the class hierarchy.