diff --git a/core/src/main/java/io/grpc/internal/ClientCallImpl.java b/core/src/main/java/io/grpc/internal/ClientCallImpl.java
index 99bf9ddc4c..9248f9cc5e 100644
--- a/core/src/main/java/io/grpc/internal/ClientCallImpl.java
+++ b/core/src/main/java/io/grpc/internal/ClientCallImpl.java
@@ -128,7 +128,7 @@ final class ClientCallImpl<ReqT, RespT> extends ClientCall<ReqT, RespT> {
      */
     ClientTransport get(PickSubchannelArgs args);
 
-    <ReqT> RetriableStream<ReqT> newRetriableStream(
+    <ReqT> ClientStream newRetriableStream(
         MethodDescriptor<ReqT, ?> method,
         CallOptions callOptions,
         Metadata headers,
@@ -416,7 +416,7 @@ final class ClientCallImpl<ReqT, RespT> extends ClientCall<ReqT, RespT> {
     try {
       if (stream instanceof RetriableStream) {
         @SuppressWarnings("unchecked")
-        RetriableStream<ReqT> retriableStream = ((RetriableStream<ReqT>) stream);
+        RetriableStream<ReqT> retriableStream = (RetriableStream<ReqT>) stream;
         retriableStream.sendMessage(message);
       } else {
         stream.writeMessage(method.streamRequest(message));
diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
index 3172c203f2..8f249905e2 100644
--- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
+++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
@@ -470,7 +470,7 @@ final class ManagedChannelImpl extends ManagedChannel implements
     }
 
     @Override
-    public <ReqT> RetriableStream<ReqT> newRetriableStream(
+    public <ReqT> ClientStream newRetriableStream(
         final MethodDescriptor<ReqT, ?> method,
         final CallOptions callOptions,
         final Metadata headers,
diff --git a/core/src/main/java/io/grpc/internal/OobChannel.java b/core/src/main/java/io/grpc/internal/OobChannel.java
index d19479daee..9bc177b0d6 100644
--- a/core/src/main/java/io/grpc/internal/OobChannel.java
+++ b/core/src/main/java/io/grpc/internal/OobChannel.java
@@ -92,7 +92,7 @@ final class OobChannel extends ManagedChannel implements InternalInstrumented<Ch
     }
 
     @Override
-    public <ReqT> RetriableStream<ReqT> newRetriableStream(MethodDescriptor<ReqT, ?> method,
+    public <ReqT> ClientStream newRetriableStream(MethodDescriptor<ReqT, ?> method,
         CallOptions callOptions, Metadata headers, Context context) {
       throw new UnsupportedOperationException("OobChannel should not create retriable streams");
     }
diff --git a/core/src/main/java/io/grpc/internal/SubchannelChannel.java b/core/src/main/java/io/grpc/internal/SubchannelChannel.java
index d59f0f0527..da402c8fb9 100644
--- a/core/src/main/java/io/grpc/internal/SubchannelChannel.java
+++ b/core/src/main/java/io/grpc/internal/SubchannelChannel.java
@@ -60,7 +60,7 @@ final class SubchannelChannel extends Channel {
       }
 
       @Override
-      public <ReqT> RetriableStream<ReqT> newRetriableStream(MethodDescriptor<ReqT, ?> method,
+      public <ReqT> ClientStream newRetriableStream(MethodDescriptor<ReqT, ?> method,
           CallOptions callOptions, Metadata headers, Context context) {
         throw new UnsupportedOperationException("OobChannel should not create retriable streams");
       }