diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
index f641b03e60c..66e7f483be5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
@@ -22,7 +22,6 @@ import java.util.List;
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory.CacheMode;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -486,10 +485,8 @@ public class RabbitProperties {
 		 */
 		private ContainerType type = ContainerType.SIMPLE;
 
-		@NestedConfigurationProperty
 		private final SimpleContainer simple = new SimpleContainer();
 
-		@NestedConfigurationProperty
 		private final DirectContainer direct = new DirectContainer();
 
 		public ContainerType getType() {
@@ -541,7 +538,6 @@ public class RabbitProperties {
 		/**
 		 * Optional properties for a retry interceptor.
 		 */
-		@NestedConfigurationProperty
 		private final ListenerRetry retry = new ListenerRetry();
 
 		public boolean isAutoStartup() {
@@ -659,7 +655,6 @@ public class RabbitProperties {
 
 	public static class Template {
 
-		@NestedConfigurationProperty
 		private final Retry retry = new Retry();
 
 		/**
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java
index da4853e2bde..26b6716c562 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java
@@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.couchbase;
 import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.util.StringUtils;
 
 /**
@@ -89,13 +88,10 @@ public class CouchbaseProperties {
 
 	public static class Env {
 
-		@NestedConfigurationProperty
 		private final Endpoints endpoints = new Endpoints();
 
-		@NestedConfigurationProperty
 		private final Ssl ssl = new Ssl();
 
-		@NestedConfigurationProperty
 		private final Timeouts timeouts = new Timeouts();
 
 		public Endpoints getEndpoints() {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
index ea105d9e108..f0f857b5038 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
@@ -23,7 +23,6 @@ import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConnection;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.util.StringUtils;
 
@@ -159,7 +158,6 @@ public class JpaProperties {
 		 */
 		private Boolean useNewIdGeneratorMappings;
 
-		@NestedConfigurationProperty
 		private final Naming naming = new Naming();
 
 		public String getDdlAuto() {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
index ba79069daa4..f4dba05b6f5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -175,7 +174,6 @@ public class ResourceProperties implements ResourceLoaderAware {
 		 */
 		private boolean gzipped = false;
 
-		@NestedConfigurationProperty
 		private final Strategy strategy = new Strategy();
 
 		/**
@@ -233,10 +231,8 @@ public class ResourceProperties implements ResourceLoaderAware {
 	 */
 	public static class Strategy {
 
-		@NestedConfigurationProperty
 		private final Fixed fixed = new Fixed();
 
-		@NestedConfigurationProperty
 		private final Content content = new Content();
 
 		public Fixed getFixed() {