Forward port of issue #42388 to 3.4.x.

Comment From: wilkinsona

The change didn't help and has been reverted in https://github.com/spring-projects/spring-boot/commit/3952d6336937ee41c90cfd392808f3cfde04fd54.