When https://github.com/spring-projects/spring-framework/issues/23795 has been fixed, we should be able to revert the main codes changes that were made in https://github.com/spring-projects/spring-boot/commit/b240c810a810c873e84d058614b5d0174591cff9. It's probably worth keeping the new tests in order to avoid future regressions.
Comment From: wilkinsona
The Framework issue has moved out to the 5.x backlog. Rescheduling accordingly.
Comment From: wilkinsona
The Framework issue has been fixed in 6.1.0 snapshots so we may be able to revert the main code changes in 3.2.x.