Reverting to spring-boot 1.5