My PR spring-cloud/spring-cloud-netflix#1448 has been merged into
Dalston, therefore we can remove our implementation and need to fix some
comile issues.