diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
index 7c613ae4..bac20fea 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
@@ -58,14 +58,11 @@ import org.springframework.integration.monitor.IntegrationMBeanExporter;
 @AutoConfigureAfter(EndpointAutoConfiguration.class)
 public class RefreshEndpointAutoConfiguration {
 
+	@ConditionalOnBean(EndpointAutoConfiguration.class)
 	@ConditionalOnMissingClass("org.springframework.boot.actuate.info.InfoContributor")
-	protected static class InfoEndpointAutoConfiguration {
-
-		@ConditionalOnBean(EndpointAutoConfiguration.class)
-		@Bean
-		InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
-			return new InfoEndpointRebinderConfiguration();
-		}
+	@Bean
+	InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
+		return new InfoEndpointRebinderConfiguration();
 	}
 
 	@ConditionalOnMissingBean
@@ -171,7 +168,7 @@ public class RefreshEndpointAutoConfiguration {
 		}
 
 		private InfoEndpoint infoEndpoint(InfoEndpoint endpoint) {
-			InfoEndpoint newEndpoint = new InfoEndpoint(endpoint.invoke()) {
+			return new InfoEndpoint(endpoint.invoke()) {
 				@Override
 				public Map<String, Object> invoke() {
 					Map<String, Object> info = new LinkedHashMap<String, Object>(
@@ -180,10 +177,6 @@ public class RefreshEndpointAutoConfiguration {
 					return info;
 				}
 			};
-			newEndpoint.setId(endpoint.getId());
-			newEndpoint.setEnabled(endpoint.isEnabled());
-			newEndpoint.setSensitive(endpoint.isSensitive());
-			return newEndpoint;
 		}
 
 	}