diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java
deleted file mode 100644
index 67fbaa6c87..0000000000
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2002-2011 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.gateway;
-
-import java.io.Serializable;
-
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageChannel;
-import org.springframework.integration.MessageHandlingException;
-import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.support.MessageBuilder;
-import org.springframework.remoting.RemoteAccessException;
-
-/**
- * A base class for outbound URL-based Messaging Gateways.
- * 
- * @author Mark Fisher
- * 
- * @deprecated as of 2.0. Will be removed in 2.1.
- */
-@Deprecated
-public abstract class AbstractRemotingOutboundGateway extends AbstractReplyProducingMessageHandler {
-
-	private final RequestReplyExchanger proxy;
-
-
-	public AbstractRemotingOutboundGateway(String url) {
-		this.proxy = this.createProxy(url);
-	}
-
-
-	public void setReplyChannel(MessageChannel replyChannel) {
-		this.setOutputChannel(replyChannel);
-	}
-
-	/**
-	 * Subclasses must implement this method. It will be invoked from the constructor.
-	 */
-	protected abstract RequestReplyExchanger createProxy(String url);
-
-
-	@Override
-	public final Object handleRequestMessage(Message<?> message) {
-		if (!(message.getPayload() instanceof Serializable)) {
-			throw new MessageHandlingException(message,
-					this.getClass().getName() + " expects a Serializable payload type " +
-					"but encountered [" + message.getPayload().getClass().getName() + "]");
-		}
-		Message<?> requestMessage = MessageBuilder.withPayload(message.getPayload())
-				.copyHeaders(message.getHeaders()).build();
-		try {
-			Message<?> reply = this.proxy.exchange(requestMessage);
-			if (reply != null) {
-				reply = MessageBuilder.fromMessage(reply).copyHeadersIfAbsent(message.getHeaders()).build();
-			}
-			return reply;
-		}
-		catch (RemoteAccessException e) {
-			throw new MessageHandlingException(message, "remote failure in Messaging Gateway", e);
-		}
-	}
-
-}
diff --git a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java
index 26eccc05a1..c6c4eafcdf 100644
--- a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java
+++ b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2011 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.
@@ -16,8 +16,15 @@
 
 package org.springframework.integration.rmi;
 
-import org.springframework.integration.gateway.AbstractRemotingOutboundGateway;
+import java.io.Serializable;
+
+import org.springframework.integration.Message;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.gateway.RequestReplyExchanger;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.support.MessageBuilder;
+import org.springframework.remoting.RemoteAccessException;
 import org.springframework.remoting.rmi.RmiProxyFactoryBean;
 
 /**
@@ -25,16 +32,42 @@ import org.springframework.remoting.rmi.RmiProxyFactoryBean;
  * 
  * @author Mark Fisher
  */
-@SuppressWarnings("deprecation")
-public class RmiOutboundGateway extends AbstractRemotingOutboundGateway {
+public class RmiOutboundGateway extends AbstractReplyProducingMessageHandler {
+
+	private final RequestReplyExchanger proxy;
+
 
 	public RmiOutboundGateway(String url) {
-		super(url);
+		this.proxy = this.createProxy(url);
 	}
 
 
+	public void setReplyChannel(MessageChannel replyChannel) {
+		this.setOutputChannel(replyChannel);
+	}
+
 	@Override
-	public RequestReplyExchanger createProxy(String url) {
+	public final Object handleRequestMessage(Message<?> message) {
+		if (!(message.getPayload() instanceof Serializable)) {
+			throw new MessageHandlingException(message,
+					this.getClass().getName() + " expects a Serializable payload type " +
+					"but encountered [" + message.getPayload().getClass().getName() + "]");
+		}
+		Message<?> requestMessage = MessageBuilder.withPayload(message.getPayload())
+				.copyHeaders(message.getHeaders()).build();
+		try {
+			Message<?> reply = this.proxy.exchange(requestMessage);
+			if (reply != null) {
+				reply = MessageBuilder.fromMessage(reply).copyHeadersIfAbsent(message.getHeaders()).build();
+			}
+			return reply;
+		}
+		catch (RemoteAccessException e) {
+			throw new MessageHandlingException(message, "remote failure in RmiOutboundGateway", e);
+		}
+	}
+
+	private RequestReplyExchanger createProxy(String url) {
 		RmiProxyFactoryBean proxyFactory = new RmiProxyFactoryBean();
 		proxyFactory.setServiceInterface(RequestReplyExchanger.class);
 		proxyFactory.setServiceUrl(url);