Modernization no longer requires custom @Bean configuration. Original pull request: #401. Fixes #396, #401.