diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml
index 238e9e2..ecffb78 100644
--- a/oauth2-ribbon/pom.xml
+++ b/oauth2-ribbon/pom.xml
@@ -32,11 +32,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-ribbon</artifactId>
 		</dependency>
-		<dependency>
-		<!--  TODO: remove this (https://github.com/spring-cloud/spring-cloud-netflix/issues/636) -->
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/oauth2-ribbon/src/main/resources/application.properties b/oauth2-ribbon/src/main/resources/application.properties
index 5a3050a..83da9f9 100644
--- a/oauth2-ribbon/src/main/resources/application.properties
+++ b/oauth2-ribbon/src/main/resources/application.properties
@@ -1,6 +1,4 @@
 security.oauth2.client.clientId: acme
 security.oauth2.client.accessTokenUri: https://example.com
-# https://github.com/spring-cloud/spring-cloud-netflix/issues/636
-spring.aop.proxy-target-class: true
 foo.ribbon.listOfServers: example.com
 # debug:
\ No newline at end of file