remove circular dependency on spring-cloud-netflix