diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
index f713978a..40978aac 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
@@ -6,7 +6,7 @@ import feign.Feign;
 import feign.Logger;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.netflix.feign.ribbon.RibbonLoadBalancerClient;
+import org.springframework.cloud.netflix.feign.ribbon.FeignRibbonClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
@@ -15,6 +15,7 @@ import com.netflix.loadbalancer.ILoadBalancer;
 
 /**
  * @author Spencer Gibb
+ * @author Julien Roy
  */
 @Configuration
 @ConditionalOnClass(Feign.class)
@@ -43,5 +44,5 @@ public class FeignAutoConfiguration {
 
     @Bean
     @ConditionalOnClass(ILoadBalancer.class)
-    public Client feignRibbonClient() { return new RibbonLoadBalancerClient(); }
+    public Client feignRibbonClient() { return new FeignRibbonClient(); }
 }
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java
index 289a8ea7..5a6447ba 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java
@@ -41,8 +41,6 @@ public class FeignConfigurer {
     Client ribbonClient;
 
     protected Feign.Builder feign() {
-        //ConfigurationManager.getConfigInstance().setProperty("exampleBackend.ribbon.listOfServers", "localhost:7080");
-        //exampleBackend.ribbon.NIWSServerListClassName=my.package.MyServerList
         return Feign.builder()
                 .logger(logger)
                 .encoder(encoder)
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/RibbonLoadBalancerClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClient.java
similarity index 90%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/RibbonLoadBalancerClient.java
rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClient.java
index d47f4031..73c4df33 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/RibbonLoadBalancerClient.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClient.java
@@ -7,9 +7,6 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.netflix.ribbon.RibbonClientPreprocessor;
-
 import com.google.common.base.Throwables;
 import com.netflix.client.ClientException;
 import com.netflix.client.ClientFactory;
@@ -22,9 +19,10 @@ import feign.Request;
 import feign.Response;
 
 /**
- * @author: Julien Roy
+ * @author Julien Roy
+ * @author Spencer Gibb
  */
-public class RibbonLoadBalancerClient implements Client {
+public class FeignRibbonClient implements Client {
 
     private Client defaultClient = new Default(
         new Lazy<SSLSocketFactory>() {
@@ -62,4 +60,8 @@ public class RibbonLoadBalancerClient implements Client {
         ILoadBalancer lb = ClientFactory.getNamedLoadBalancer(clientName);
         return new RibbonLoadBalancer(defaultClient, lb, config);
     }
+
+    public void setDefaultClient(Client defaultClient) {
+        this.defaultClient = defaultClient;
+    }
 }