diff --git a/akka-remote/src/main/scala/akka/remote/RemoteServer.scala b/akka-remote/src/main/scala/akka/remote/RemoteServer.scala
index 13e381e2c5..9fa86e25df 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteServer.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteServer.scala
@@ -116,6 +116,13 @@ object RemoteServer {
   private val guard = new ReadWriteGuard
   private val remoteServers =   Map[Address, RemoteServer]()
 
+  def serverFor(address: InetSocketAddress): Option[RemoteServer] =
+    serverFor(address.getHostName, address.getPort)
+
+  def serverFor(hostname: String, port: Int): Option[RemoteServer] = guard.withReadGuard {
+    remoteServers.get(Address(hostname, port))
+  }
+
   private[akka] def getOrCreateServer(address: InetSocketAddress): RemoteServer = guard.withWriteGuard {
     serverFor(address) match {
       case Some(server) => server
@@ -123,13 +130,6 @@ object RemoteServer {
     }
   }
 
-  private[akka] def serverFor(address: InetSocketAddress): Option[RemoteServer] =
-    serverFor(address.getHostName, address.getPort)
-
-  private[akka] def serverFor(hostname: String, port: Int): Option[RemoteServer] = guard.withReadGuard {
-    remoteServers.get(Address(hostname, port))
-  }
-
   private[akka] def register(hostname: String, port: Int, server: RemoteServer) = guard.withWriteGuard {
     remoteServers.put(Address(hostname, port), server)
   }