Backport of gh-9018

Comment From: spring-projects-issues

Fixed via 5bce912446eec508bb2c2fca1fb139b34809c86e

Comment From: jzheaux

Ticket created by accidental push to 5.1.x branch.