Backport of gh-9772

Comment From: rwinch

Closed via https://github.com/spring-projects/spring-security/commit/bf9f1de6e1d935d9a87adb3a070cd8cf9d2dcdce