diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
index 7280b374b..bdd9032e0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
@@ -26,7 +26,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
@@ -100,12 +99,4 @@ public abstract class AbstractMongoConfiguration {
 	 */
 	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
 	}
-
-	@Bean
-	public MappingContextAwareBeanPostProcessor mappingContextAwareBeanPostProcessor() {
-		MappingContextAwareBeanPostProcessor bpp = new MappingContextAwareBeanPostProcessor();
-		bpp.setMappingContextBeanName("mongoMappingContext");
-		return bpp;
-	}
-
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
index 776e24e32..c1d21bf09 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
@@ -25,6 +25,4 @@ public abstract class BeanNames {
 	static final String INDEX_HELPER = "indexCreationHelper";
 	static final String MONGO = "mongo";
 	static final String DB_FACTORY = "mongoDbFactory";
-	static final String POST_PROCESSOR = "mappingContextAwareBeanPostProcessor";
-
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
index 3866d15eb..87e143059 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
@@ -38,7 +38,6 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
-import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
@@ -70,15 +69,6 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
 		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
 
-		try {
-			registry.getBeanDefinition(POST_PROCESSOR);
-		} catch (NoSuchBeanDefinitionException ignored) {
-			BeanDefinitionBuilder postProcBuilder = BeanDefinitionBuilder
-					.genericBeanDefinition(MappingContextAwareBeanPostProcessor.class);
-			postProcBuilder.addPropertyValue("mappingContextBeanName", ctxRef);
-			registry.registerBeanDefinition(POST_PROCESSOR, postProcBuilder.getBeanDefinition());
-		}
-
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
 		if (!StringUtils.hasText(dbFactoryRef)) {