https://github.com/spring-cloud/spring-cloud-netflix/pull/1372 has been merged. So it is save to remove the local workaround.
