diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java
index a1db7e8..c9130d9 100644
--- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java
+++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java
@@ -34,9 +34,9 @@ import org.springframework.core.env.Environment;
  * @author Josh Long
  */
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnClass(CloudFoundryClient.class)
 @ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.enabled", matchIfMissing = true)
+@EnableConfigurationProperties(CloudFoundryDiscoveryProperties.class)
 public class CloudFoundryDiscoveryClientConfiguration {
 
 	@Autowired
@@ -74,8 +74,4 @@ public class CloudFoundryDiscoveryClientConfiguration {
 		return new CloudFoundryDiscoveryClient(cloudFoundryClient, environment);
 	}
 
-	@Bean
-	public CloudFoundryDiscoveryProperties cloudFoundryDiscoveryProperties() {
-		return new CloudFoundryDiscoveryProperties();
-	}
 }
\ No newline at end of file