diff --git a/core/src/main/java/io/grpc/ManagedChannelBuilder.java b/core/src/main/java/io/grpc/ManagedChannelBuilder.java
index cf3ef38ac7..1f97a0f589 100644
--- a/core/src/main/java/io/grpc/ManagedChannelBuilder.java
+++ b/core/src/main/java/io/grpc/ManagedChannelBuilder.java
@@ -31,8 +31,6 @@
 
 package io.grpc;
 
-import io.grpc.ManagedChannelProvider;
-
 import java.util.List;
 import java.util.concurrent.Executor;
 
@@ -42,7 +40,7 @@ import java.util.concurrent.Executor;
  * @param <T> The concrete type of this builder.
  */
 public abstract class ManagedChannelBuilder<T extends ManagedChannelBuilder<T>> {
-  public static ManagedChannelBuilder forAddress(String name, int port) {
+  public static ManagedChannelBuilder<?> forAddress(String name, int port) {
     return ManagedChannelProvider.provider().builderForAddress(name, port);
   }
 
diff --git a/core/src/main/java/io/grpc/ManagedChannelProvider.java b/core/src/main/java/io/grpc/ManagedChannelProvider.java
index 6eba28e5fe..991b8e1ec0 100644
--- a/core/src/main/java/io/grpc/ManagedChannelProvider.java
+++ b/core/src/main/java/io/grpc/ManagedChannelProvider.java
@@ -104,7 +104,7 @@ public abstract class ManagedChannelProvider {
   /**
    * Creates a new builder with the given host and port.
    */
-  protected abstract ManagedChannelBuilder builderForAddress(String name, int port);
+  protected abstract ManagedChannelBuilder<?> builderForAddress(String name, int port);
 
   public static final class ProviderNotFoundException extends RuntimeException {
     public ProviderNotFoundException(String msg) {
diff --git a/core/src/test/java/io/grpc/ManagedChannelProviderTest.java b/core/src/test/java/io/grpc/ManagedChannelProviderTest.java
index f228499ea5..ab03cafc70 100644
--- a/core/src/test/java/io/grpc/ManagedChannelProviderTest.java
+++ b/core/src/test/java/io/grpc/ManagedChannelProviderTest.java
@@ -110,7 +110,7 @@ public class ManagedChannelProviderTest {
     }
 
     @Override
-    protected ManagedChannelBuilder builderForAddress(String host, int port) {
+    protected ManagedChannelBuilder<?> builderForAddress(String host, int port) {
       throw new UnsupportedOperationException();
     }
   }