diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettings.java b/google-cloud-clients/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettings.java
index 8b4f8fa16db8..1b77bb5aec7f 100644
--- a/google-cloud-clients/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettings.java
+++ b/google-cloud-clients/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettings.java
@@ -20,7 +20,6 @@
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
-import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ServerStreamingCallSettings;
@@ -40,7 +39,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.Empty;
 import java.util.List;
-import org.threeten.bp.Duration;
 
 /**
  * Settings class to configure an instance of {@link EnhancedBigQueryStorageStub}.
@@ -65,9 +63,6 @@
 public class EnhancedBigQueryStorageStubSettings
     extends StubSettings<EnhancedBigQueryStorageStubSettings> {
 
-  // The largest possible inbound message is a ReadRowsResponse with a single 10mb Row object.
-  private static final int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 11;
-
   private final UnaryCallSettings<CreateReadSessionRequest, ReadSession> createReadSessionSettings;
   private final ServerStreamingCallSettings<ReadRowsRequest, ReadRowsResponse> readRowsSettings;
   private final UnaryCallSettings<
@@ -127,9 +122,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return BigQueryStorageStubSettings.defaultGrpcTransportProviderBuilder()
-        .setChannelsPerCpu(2.0)
-        .setMaxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE);
+    return BigQueryStorageStubSettings.defaultGrpcTransportProviderBuilder();
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {
@@ -171,17 +164,6 @@ protected EnhancedBigQueryStorageStubSettings(Builder settingsBuilder) {
   public static class Builder
       extends StubSettings.Builder<EnhancedBigQueryStorageStubSettings, Builder> {
 
-    private static final RetrySettings READ_ROWS_RETRY_SETTINGS =
-        RetrySettings.newBuilder()
-            .setInitialRetryDelay(Duration.ofMillis(100L))
-            .setRetryDelayMultiplier(1.3)
-            .setMaxRetryDelay(Duration.ofMinutes(1L))
-            .setInitialRpcTimeout(Duration.ofDays(1L))
-            .setRpcTimeoutMultiplier(1.0)
-            .setMaxRpcTimeout(Duration.ofDays(1L))
-            .setTotalTimeout(Duration.ofDays(1L))
-            .build();
-
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
     private final UnaryCallSettings.Builder<CreateReadSessionRequest, ReadSession>
@@ -218,10 +200,7 @@ protected Builder(ClientContext clientContext) {
 
       // Per-method settings using override values for defaults.
       readRowsSettings =
-          baseDefaults
-              .readRowsSettings()
-              .setRetrySettings(READ_ROWS_RETRY_SETTINGS)
-              .setResumptionStrategy(new ReadRowsResumptionStrategy());
+          baseDefaults.readRowsSettings().setResumptionStrategy(new ReadRowsResumptionStrategy());
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java
index a7e6eb7883b3..b45dd797fddd 100644
--- a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java
+++ b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java
@@ -44,8 +44,6 @@
 @RunWith(JUnit4.class)
 public class EnhancedBigQueryStorageStubSettingsTest {
 
-  private static final int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 11;
-
   @Test
   public void testSettingsArePreserved() {
     String endpoint = "some.other.host:123";
@@ -86,9 +84,7 @@ private void verifyBuilder(
 
     InstantiatingGrpcChannelProvider channelProvider =
         (InstantiatingGrpcChannelProvider) builder.getTransportChannelProvider();
-    assertThat(channelProvider.toBuilder().getMaxInboundMessageSize())
-        .isEqualTo(MAX_INBOUND_MESSAGE_SIZE);
-    assertThat(channelProvider.toBuilder().getPoolSize()).isGreaterThan(1);
+    assertThat(channelProvider.toBuilder().getMaxInboundMessageSize()).isEqualTo(Integer.MAX_VALUE);
   }
 
   private void verifySettings(
@@ -104,9 +100,7 @@ private void verifySettings(
 
     InstantiatingGrpcChannelProvider channelProvider =
         (InstantiatingGrpcChannelProvider) settings.getTransportChannelProvider();
-    assertThat(channelProvider.toBuilder().getMaxInboundMessageSize())
-        .isEqualTo(MAX_INBOUND_MESSAGE_SIZE);
-    assertThat(channelProvider.toBuilder().getPoolSize()).isGreaterThan(1);
+    assertThat(channelProvider.toBuilder().getMaxInboundMessageSize()).isEqualTo(Integer.MAX_VALUE);
   }
 
   @Test