diff --git a/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala b/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala
index cc7e3b3851..7bd3124792 100644
--- a/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala
+++ b/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala
@@ -35,7 +35,7 @@ class DaemonMsgCreateSerializer(val system: ExtendedActorSystem) extends Seriali
   import ProtobufSerializer.serializeActorRef
   import ProtobufSerializer.deserializeActorRef
 
-  def includeManifest: Boolean = true
+  def includeManifest: Boolean = false
   def identifier = 3
   lazy val serialization = SerializationExtension(system)
 
diff --git a/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala b/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala
index a564e92088..0ca5216da0 100644
--- a/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala
+++ b/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala
@@ -17,7 +17,7 @@ class DaemonMsgWatchSerializer(val system: ExtendedActorSystem) extends Serializ
   import ProtobufSerializer.serializeActorRef
   import ProtobufSerializer.deserializeActorRef
 
-  def includeManifest: Boolean = true
+  def includeManifest: Boolean = false
   def identifier = 4
 
   def toBinary(obj: AnyRef): Array[Byte] = obj match {
diff --git a/akka-remote/src/main/scala/akka/serialization/ProtobufSerializer.scala b/akka-remote/src/main/scala/akka/serialization/ProtobufSerializer.scala
index 72690b3c91..d9a5c7b0c4 100644
--- a/akka-remote/src/main/scala/akka/serialization/ProtobufSerializer.scala
+++ b/akka-remote/src/main/scala/akka/serialization/ProtobufSerializer.scala
@@ -11,6 +11,11 @@ import akka.actor.ActorSystem
 import akka.actor.ActorRef
 
 object ProtobufSerializer {
+
+  /**
+   * Helper to serialize an [[akka.actor.ActorRef]] to Akka's
+   * protobuf representation.
+   */
   def serializeActorRef(ref: ActorRef): ActorRefProtocol = {
     val identifier: String = Serialization.currentTransportAddress.value match {
       case null    ⇒ ref.path.toString
@@ -19,6 +24,11 @@ object ProtobufSerializer {
     ActorRefProtocol.newBuilder.setPath(identifier).build
   }
 
+  /**
+   * Helper to materialize (lookup) an [[akka.actor.ActorRef]]
+   * from Akka's protobuf representation in the supplied
+   * [[akka.actor.ActorSystem].
+   */
   def deserializeActorRef(system: ActorSystem, refProtocol: ActorRefProtocol): ActorRef =
     system.actorFor(refProtocol.getPath)
 }