diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index 29d1374dbc..e96a5b37c9 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@@ -93,17 +93,16 @@ object Props {
  * {{{
  *  val props = Props[MyActor]
  *  val props = Props(new MyActor)
- *  val props = Props {
+ *  val props = Props(
  *    creator = ..,
  *    dispatcher = ..,
  *    timeout = ..,
  *    faultHandler = ..,
  *    routerConfig = ..
- *  }
+ *  )
  *  val props = Props().withCreator(new MyActor)
  *  val props = Props[MyActor].withTimeout(timeout)
- *  val props = Props[MyActor].withRouter[RoundRobinRouter]
- *  val props = Props[MyActor].withRouter(new RoundRobinRouter(..))
+ *  val props = Props[MyActor].withRouter(RoundRobinRouter(..))
  *  val props = Props[MyActor].withFaultHandler(OneForOneStrategy {
  *    case e: IllegalStateException ⇒ Resume
  *  })
@@ -199,20 +198,4 @@ case class Props(
    * Returns a new Props with the specified router config set.
    */
   def withRouter(r: RouterConfig) = copy(routerConfig = r)
-
-  /**
-   * Returns a new Props with the specified router config set.
-   *
-   * Scala API.
-   */
-  def withRouter[T <: RouterConfig: ClassManifest] = {
-    val routerConfig = implicitly[ClassManifest[T]].erasure.asInstanceOf[Class[_ <: RouterConfig]] match {
-      case RoundRobinRouterClass    ⇒ RoundRobinRouter()
-      case RandomRouterClass        ⇒ RandomRouter()
-      case BroadcastRouterClass     ⇒ BroadcastRouter()
-      case ScatterGatherRouterClass ⇒ ScatterGatherFirstCompletedRouter()
-      case unknown                  ⇒ throw new akka.config.ConfigurationException("Router not supported [" + unknown.getName + "]")
-    }
-    copy(routerConfig = routerConfig)
-  }
 }
diff --git a/akka-actor/src/main/scala/akka/routing/package.scala b/akka-actor/src/main/scala/akka/routing/package.scala
index 579484493c..44662856b1 100644
--- a/akka-actor/src/main/scala/akka/routing/package.scala
+++ b/akka-actor/src/main/scala/akka/routing/package.scala
@@ -5,12 +5,5 @@
 package akka
 
 package object routing {
-
   type Route = PartialFunction[(akka.actor.ActorRef, Any), Iterable[Destination]]
-
-  // To allow pattern matching on the class types
-  val RoundRobinRouterClass = classOf[RoundRobinRouter]
-  val RandomRouterClass = classOf[RandomRouter]
-  val BroadcastRouterClass = classOf[BroadcastRouter]
-  val ScatterGatherRouterClass = classOf[ScatterGatherFirstCompletedRouter]
 }
diff --git a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
index 4d19f47db4..b46ed3f1f8 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
@@ -50,7 +50,7 @@ object Pi extends App {
     var start: Long = _
 
     //#create-router
-    val router = context.actorOf(Props[Worker].withRouter(RoundRobinRouter(nrOfInstances = nrOfWorkers)), "pi")
+    val router = context.actorOf(Props[Worker].withRouter(RoundRobinRouter(nrOfWorkers)), "pi")
     //#create-router
 
     //#master-receive