Once https://github.com/spring-projects/spring-security/issues/9811 has been fixed and we've moved to 5.5.1 snapshots we should be able to revert 7b490f0.