diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java
index 735cfdfa5e..8d73d916ac 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java
@@ -100,19 +100,6 @@ public class ApplicationContextMessageBus implements MessageBus, ChannelResolver
 		return this.channelResolver.resolveChannelName(channelName);
 	}
 
-	public void registerEndpoint(MessageEndpoint endpoint) {
-		Assert.notNull(endpoint, "'endpoint' must not be null");
-		if (!this.endpoints.contains(endpoint)) {
-			this.endpoints.add(endpoint);
-		}
-		if (this.isRunning()) {
-			this.activateEndpoint(endpoint);
-		}
-		if (logger.isInfoEnabled()) {
-			logger.info("registered endpoint '" + endpoint + "'");
-		}
-	}
-
 	private Collection<MessageEndpoint> getEndpoints() {
 		GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(this.applicationContext);
 		this.endpoints.addAll(accessor.getBeansOfType(MessageEndpoint.class).values());
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
index 314828077b..4a7a04955e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.bus;
 
 import org.springframework.context.Lifecycle;
-import org.springframework.integration.endpoint.MessageEndpoint;
 
 /**
  * The message bus interface.
@@ -26,6 +25,4 @@ import org.springframework.integration.endpoint.MessageEndpoint;
  */
 public interface MessageBus extends Lifecycle {
 
-	void registerEndpoint(MessageEndpoint endpoint);
-
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStartedEvent.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStartedEvent.java
index ca1aa824f6..9693daae8e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStartedEvent.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStartedEvent.java
@@ -30,7 +30,7 @@ public class MessageBusStartedEvent extends ApplicationEvent {
 	 * @param source the <code>MessageBus</code> that has been started
 	 * (must not be <code>null</code>)
 	 */
-	public MessageBusStartedEvent(MessageBus source) {
+	public MessageBusStartedEvent(Object source) {
 		super(source);
 	}
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStoppedEvent.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStoppedEvent.java
index e3b2acd98f..e1d3c333b3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStoppedEvent.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusStoppedEvent.java
@@ -30,7 +30,7 @@ public class MessageBusStoppedEvent extends ApplicationEvent {
 	 * @param source the <code>MessageBus</code> that has been stopped
 	 * (must not be <code>null</code>)
 	 */
-	public MessageBusStoppedEvent(MessageBus source) {
+	public MessageBusStoppedEvent(Object source) {
 		super(source);
 	}