diff --git a/core/src/main/java/io/grpc/CallOptions.java b/core/src/main/java/io/grpc/CallOptions.java
index 11f91df405..ac1aa8b555 100644
--- a/core/src/main/java/io/grpc/CallOptions.java
+++ b/core/src/main/java/io/grpc/CallOptions.java
@@ -167,7 +167,6 @@ public final class CallOptions {
* 'Fail fast'
* is the default option for gRPC calls and 'wait for ready' is the opposite to it.
*/
- @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1915")
public CallOptions withWaitForReady() {
CallOptions newOptions = new CallOptions(this);
newOptions.waitForReady = true;
@@ -178,7 +177,6 @@ public final class CallOptions {
* Disables 'wait for ready' feature for the call.
* This method should be rarely used because the default is without 'wait for ready'.
*/
- @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1915")
public CallOptions withoutWaitForReady() {
CallOptions newOptions = new CallOptions(this);
newOptions.waitForReady = false;
@@ -332,7 +330,6 @@ public final class CallOptions {
* 'Fail fast'
* is the default option for gRPC calls and 'wait for ready' is the opposite to it.
*/
- @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1915")
public boolean isWaitForReady() {
return waitForReady;
}
diff --git a/core/src/main/java/io/grpc/Server.java b/core/src/main/java/io/grpc/Server.java
index cdaf25ef13..dc713c0b1c 100644
--- a/core/src/main/java/io/grpc/Server.java
+++ b/core/src/main/java/io/grpc/Server.java
@@ -60,7 +60,6 @@ public abstract class Server {
*
* @throws IllegalStateException if the server has not yet been started.
*/
- @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1780")
public int getPort() {
return -1;
}
diff --git a/stub/src/main/java/io/grpc/stub/AbstractStub.java b/stub/src/main/java/io/grpc/stub/AbstractStub.java
index 199a2890ab..9cb80bff6d 100644
--- a/stub/src/main/java/io/grpc/stub/AbstractStub.java
+++ b/stub/src/main/java/io/grpc/stub/AbstractStub.java
@@ -171,7 +171,6 @@ public abstract class AbstractStub> {
/**
* Returns a new stub that uses the 'wait for ready' call option.
*/
- @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1915")
public final S withWaitForReady() {
return build(channel, callOptions.withWaitForReady());
}
diff --git a/stub/src/main/java/io/grpc/stub/ServerCalls.java b/stub/src/main/java/io/grpc/stub/ServerCalls.java
index 84d094b138..da71f272df 100644
--- a/stub/src/main/java/io/grpc/stub/ServerCalls.java
+++ b/stub/src/main/java/io/grpc/stub/ServerCalls.java
@@ -33,7 +33,6 @@ package io.grpc.stub;
import static com.google.common.base.Preconditions.checkNotNull;
-import io.grpc.ExperimentalApi;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.ServerCall;
@@ -44,7 +43,6 @@ import io.grpc.Status;
* Utility functions for adapting {@link ServerCallHandler}s to application service implementation,
* meant to be used by the generated code.
*/
-@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1790")
public final class ServerCalls {
private ServerCalls() {