Fix regression from upstream fix for #58921238 / bs-333 in spring-boot commit acf458b.