diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
index f784f71652..e92058c71c 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
@@ -22,7 +22,6 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.Map;
 
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.message.MessageCreator;
@@ -37,12 +36,10 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  * @author Marius Bogoevici
  */
-public class FileSource extends AbstractDirectorySource implements MessageSource<Object>, InitializingBean, MessageDeliveryAware {
+public class FileSource extends AbstractDirectorySource implements MessageSource<Object>, MessageDeliveryAware {
 
 	private final File directory;
 
-	private volatile MessageCreator<File, ?> messageCreator;
-
 	private volatile FileFilter fileFilter;
 
 	private volatile FilenameFilter filenameFilter;
@@ -68,10 +65,6 @@ public class FileSource extends AbstractDirectorySource implements MessageSource
 	}
 
 
-	public void setMessageCreator(MessageCreator<File, ?> messageCreator) {
-		this.messageCreator = messageCreator;
-	}
-
 	public void setFileFilter(FileFilter fileFilter) {
 		this.fileFilter = fileFilter;
 	}
@@ -80,12 +73,6 @@ public class FileSource extends AbstractDirectorySource implements MessageSource
 		this.filenameFilter = filenameFilter;
 	}
 
-	public void afterPropertiesSet() {
-		if (null == this.messageCreator) {
-			this.messageCreator = new FileMessageCreator();
-		}
-	}
-
 	@Override
 	protected void disconnect() {
 		// No action is necessary