diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelNameResolvingRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelNameResolvingRouterParser.java
deleted file mode 100644
index 0d274480b6..0000000000
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelNameResolvingRouterParser.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2002-2010 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.config.xml;
-
-import java.util.List;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-/**
- * Base parser for routers that create instances that are subclasses of AbstractChannelNameResolvingMessageRouter.
- * 
- * @author Mark Fisher
- * @author Oleg Zhurakousky
- */
-public abstract class AbstractChannelNameResolvingRouterParser extends AbstractRouterParser {
-
-	@Override
-	protected final BeanDefinition parseRouter(Element element, ParserContext parserContext) {
-		BeanDefinition beanDefinition = this.doParseRouter(element, parserContext);
-		if (beanDefinition != null) {
-			String channelResolver = element.getAttribute("channel-resolver");
-			if (StringUtils.hasText(channelResolver)){
-				beanDefinition.getPropertyValues().add("channelResolver", new RuntimeBeanReference(channelResolver));
-			}
-			// check if mapping is provided otherwise returned values will be treated as channel names
-			List<Element> childElements = DomUtils.getChildElementsByTagName(element, "mapping");
-			if (childElements != null && childElements.size() > 0) {
-				ManagedMap<String, String> channelMap = new ManagedMap<String, String>();
-				for (Element childElement : childElements) {
-					String beanClassName = beanDefinition.getBeanClassName();
-					String key = null;
-					if (beanClassName.endsWith("PayloadTypeRouter")){
-						key = childElement.getAttribute("type"); 
-					} 
-					else {
-						key = childElement.getAttribute("value");
-					} 
-					channelMap.put(key, childElement.getAttribute("channel"));
-				}
-				beanDefinition.getPropertyValues().add("channelIdentifierMap", channelMap);
-			}
-		}
-		return beanDefinition;
-	}
-
-	protected abstract BeanDefinition doParseRouter(Element element, ParserContext parserContext);
-
-}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java
index d2a3d0f241..002d1c8c10 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java
@@ -16,11 +16,17 @@
 
 package org.springframework.integration.config.xml;
 
+import java.util.List;
+
 import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.util.StringUtils;
+import org.springframework.util.xml.DomUtils;
 
 /**
  * Base parser for routers.
@@ -44,6 +50,34 @@ public abstract class AbstractRouterParser extends AbstractConsumerEndpointParse
 		return builder;
 	}
 
-	protected abstract BeanDefinition parseRouter(Element element, ParserContext parserContext);
+	protected final BeanDefinition parseRouter(Element element, ParserContext parserContext) {
+		BeanDefinition beanDefinition = this.doParseRouter(element, parserContext);
+		if (beanDefinition != null) {
+			String channelResolver = element.getAttribute("channel-resolver");
+			if (StringUtils.hasText(channelResolver)){
+				beanDefinition.getPropertyValues().add("channelResolver", new RuntimeBeanReference(channelResolver));
+			}
+			// check if mapping is provided otherwise returned values will be treated as channel names
+			List<Element> childElements = DomUtils.getChildElementsByTagName(element, "mapping");
+			if (childElements != null && childElements.size() > 0) {
+				ManagedMap<String, String> channelMap = new ManagedMap<String, String>();
+				for (Element childElement : childElements) {
+					String beanClassName = beanDefinition.getBeanClassName();
+					String key = null;
+					if (beanClassName.endsWith("PayloadTypeRouter")){
+						key = childElement.getAttribute("type"); 
+					} 
+					else {
+						key = childElement.getAttribute("value");
+					} 
+					channelMap.put(key, childElement.getAttribute("channel"));
+				}
+				beanDefinition.getPropertyValues().add("channelIdentifierMap", channelMap);
+			}
+		}
+		return beanDefinition;
+	}
+
+	protected abstract BeanDefinition doParseRouter(Element element, ParserContext parserContext);
 
 }
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderValueRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderValueRouterParser.java
index dee7eafcf2..704489c496 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderValueRouterParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderValueRouterParser.java
@@ -29,7 +29,7 @@ import org.springframework.beans.factory.xml.ParserContext;
  * @author Mark Fisher
  * @since 1.0.3
  */
-public class HeaderValueRouterParser extends AbstractChannelNameResolvingRouterParser {
+public class HeaderValueRouterParser extends AbstractRouterParser {
 
 	@Override
 	protected BeanDefinition doParseRouter(Element element, ParserContext parserContext) {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java
index 38167dc759..e831d633fd 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
  * @author Mark Fisher
  * @since 1.0.3
  */
-public class PayloadTypeRouterParser extends AbstractChannelNameResolvingRouterParser {
+public class PayloadTypeRouterParser extends AbstractRouterParser {
 	
 	@Override
 	protected BeanDefinition doParseRouter(Element element,
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java
index 372f934501..22da832772 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java
@@ -19,7 +19,7 @@ package org.springframework.integration.xml.config;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.config.xml.AbstractChannelNameResolvingRouterParser;
+import org.springframework.integration.config.xml.AbstractRouterParser;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
@@ -32,7 +32,7 @@ import org.w3c.dom.NodeList;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  */
-public class XPathRouterParser extends AbstractChannelNameResolvingRouterParser {
+public class XPathRouterParser extends AbstractRouterParser {
 
 	private XPathExpressionParser xpathParser = new XPathExpressionParser();