Fixes https://github.com/spring-projects/spring-boot/issues/26151

Comment From: mbhave

Thanks for the PR @nguyensach. There were few edge cases with this code so we decided to take a slightly different approach.