Revert change to work around issue in Spring Boot