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 8303fb77..c643df8a 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
@@ -79,7 +79,7 @@ public class FeignAutoConfiguration {
 
 	// the following configuration is for alternate feign clients if
 	// ribbon is not on the class path.
-	// see corresponding confiurations in FeignRibbonClientAutoConfiguration
+	// see corresponding configurations in FeignRibbonClientAutoConfiguration
 	// for load balanced ribbon clients.
 	@Configuration
 	@ConditionalOnClass(ApacheHttpClient.class)
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java
index 67a11c46..ee4cf568 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java
@@ -108,20 +108,4 @@ public class FeignClientsConfiguration {
 		return Feign.builder();
 	}
 
-	@Configuration
-	@ConditionalOnClass(ApacheHttpClient.class)
-	protected static class HttpClientConfiguration {
-
-		@Autowired(required = false)
-		private HttpClient httpClient;
-
-		@ConditionalOnMissingBean
-		@Bean
-		public Client feignClient() {
-			if (this.httpClient != null) {
-				return new ApacheHttpClient(this.httpClient);
-			}
-			return new ApacheHttpClient();
-		}
-	}
 }
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientOverrideDefaultsTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientOverrideDefaultsTests.java
index 92d82311..bbd84a5e 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientOverrideDefaultsTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientOverrideDefaultsTests.java
@@ -157,7 +157,7 @@ public class FeignClientOverrideDefaultsTests {
 		}
 	}
 
-	@FeignClient(value = "foo", configuration = FooConfiguration.class)
+	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
 	interface FooClient {
 		@RequestLine("GET /")
 		String get();
@@ -191,7 +191,7 @@ public class FeignClientOverrideDefaultsTests {
 		}
 	}
 
-	@FeignClient(value = "bar", configuration = BarConfiguration.class)
+	@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
 	interface BarClient {
 		@RequestMapping(value = "/", method = RequestMethod.GET)
 		String get();