diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index 6777d9ecc3..8807828c01 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ package org.springframework.integration.config.annotation;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.channel.BeanFactoryChannelResolver;
 import org.springframework.integration.channel.ChannelResolver;
@@ -43,14 +43,14 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 	private static final String INPUT_CHANNEL_ATTRIBUTE = "inputChannel";
 
 
-	protected final GenericBeanFactoryAccessor beanFactoryAccessor;
+	protected final BeanFactory beanFactory;
 
 	protected final ChannelResolver channelResolver;
 
 
 	public AbstractMethodAnnotationPostProcessor(ListableBeanFactory beanFactory) {
 		Assert.notNull(beanFactory, "BeanFactory must not be null");
-		this.beanFactoryAccessor = new GenericBeanFactoryAccessor(beanFactory);
+		this.beanFactory = beanFactory;
 		this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
 	}
 
@@ -78,7 +78,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 					"The input channel for an Annotation-based endpoint must be a SubscribableChannel.");
 			endpoint = new EventDrivenConsumer((SubscribableChannel) inputChannel, handler);
 			if (handler instanceof BeanFactoryAware) {
-				((BeanFactoryAware) handler).setBeanFactory(this.beanFactoryAccessor.getBeanFactory());
+				((BeanFactoryAware) handler).setBeanFactory(this.beanFactory);
 			}
 		}
 		return endpoint;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java
index 3a6a4148aa..c1f3247d59 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public class AggregatorAnnotationPostProcessor extends AbstractMethodAnnotationP
 		aggregator.setReaperInterval(annotation.reaperInterval());
 		aggregator.setTimeout(annotation.timeout());
 		aggregator.setTrackedCorrelationIdCapacity(annotation.trackedCorrelationIdCapacity());
-		aggregator.setBeanFactory(this.beanFactoryAccessor.getBeanFactory());
+		aggregator.setBeanFactory(this.beanFactory);
 		aggregator.afterPropertiesSet();
 		return aggregator;
 	}