diff --git a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java
index b84f03e9156d..f27ace8b01b3 100644
--- a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java
+++ b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java
@@ -214,9 +214,7 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings)
    */
   public static ChannelProvider setUpChannelProvider(
       InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
-    HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost());
-    providerBuilder.setServiceAddress(hostAndPort.getHostText())
-        .setPort(hostAndPort.getPort())
+    providerBuilder.setEndpoint(serviceOptions.getHost())
         .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
             firstNonNull(ServiceOptions.getLibraryVersion(), ""));
     Credentials scopedCredentials = serviceOptions.getScopedCredentials();