diff --git a/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java b/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java
index e636aae660aa8..4bbc4781ff649 100644
--- a/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java
+++ b/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java
@@ -22,7 +22,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.util.concurrent.Futures.immediateFuture;
@@ -66,12 +65,6 @@ public boolean isFinished()
         return source.isFinished();
     }
 
-    @Override
-    public Optional<Integer> getMinScheduleSplitBatchSize()
-    {
-        return source.getMinScheduleSplitBatchSize();
-    }
-
     private static class GetNextBatch
     {
         private final SplitSource splitSource;
diff --git a/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java b/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java
index 60ad772bc34ba..4bce504db55bc 100644
--- a/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java
+++ b/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java
@@ -24,8 +24,6 @@
 import io.trino.spi.connector.ConnectorSplitSource;
 import io.trino.spi.connector.ConnectorSplitSource.ConnectorSplitBatch;
 
-import java.util.Optional;
-
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
 import static java.util.Objects.requireNonNull;
@@ -73,12 +71,6 @@ public boolean isFinished()
         return source.isFinished();
     }
 
-    @Override
-    public Optional<Integer> getMinScheduleSplitBatchSize()
-    {
-        return source.getMinScheduleSplitBatchSize();
-    }
-
     @Override
     public String toString()
     {
diff --git a/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java b/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java
index 609c9b42bedb2..dab7ac7342048 100644
--- a/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java
+++ b/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java
@@ -21,7 +21,6 @@
 
 import javax.annotation.Nullable;
 
-import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -69,10 +68,4 @@ public boolean isFinished()
     {
         return splitSource.isFinished();
     }
-
-    @Override
-    public Optional<Integer> getMinScheduleSplitBatchSize()
-    {
-        return splitSource.getMinScheduleSplitBatchSize();
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/split/SplitManager.java b/core/trino-main/src/main/java/io/trino/split/SplitManager.java
index dd73cc549503e..3fde0e7491202 100644
--- a/core/trino-main/src/main/java/io/trino/split/SplitManager.java
+++ b/core/trino-main/src/main/java/io/trino/split/SplitManager.java
@@ -34,7 +34,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;
 
 public class SplitManager
@@ -93,10 +92,6 @@ public SplitSource getSplits(Session session, TableHandle table, SplitScheduling
         }
 
         SplitSource splitSource = new ConnectorAwareSplitSource(catalogName, source);
-        int minScheduleSplitBatchSize = this.minScheduleSplitBatchSize;
-        if (splitSource.getMinScheduleSplitBatchSize().isPresent()) {
-            minScheduleSplitBatchSize = min(minScheduleSplitBatchSize, splitSource.getMinScheduleSplitBatchSize().get());
-        }
         if (minScheduleSplitBatchSize > 1) {
             splitSource = new BufferingSplitSource(splitSource, minScheduleSplitBatchSize);
         }
diff --git a/core/trino-main/src/main/java/io/trino/split/SplitSource.java b/core/trino-main/src/main/java/io/trino/split/SplitSource.java
index 20ee3a540195c..fff277bec4268 100644
--- a/core/trino-main/src/main/java/io/trino/split/SplitSource.java
+++ b/core/trino-main/src/main/java/io/trino/split/SplitSource.java
@@ -21,7 +21,6 @@
 
 import java.io.Closeable;
 import java.util.List;
-import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
@@ -63,6 +62,4 @@ public boolean isLastBatch()
             return lastBatch;
         }
     }
-
-    Optional<Integer> getMinScheduleSplitBatchSize();
 }
diff --git a/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java b/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java
index 54297ed2d75b2..83fb7587886f8 100644
--- a/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java
+++ b/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java
@@ -28,7 +28,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
@@ -142,12 +141,6 @@ public boolean isFinished()
         return splitsProduced == totalSplits && atSplitDepletion == FINISH;
     }
 
-    @Override
-    public Optional<Integer> getMinScheduleSplitBatchSize()
-    {
-        return Optional.empty();
-    }
-
     public int getNextBatchInvocationCount()
     {
         return nextBatchInvocationCount;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java
index 4057f1ed56054..c459e29b19fb0 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java
@@ -15,7 +15,6 @@
 
 import java.io.Closeable;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 import static java.util.Objects.requireNonNull;
@@ -59,9 +58,4 @@ public boolean isNoMoreSplits()
             return noMoreSplits;
         }
     }
-
-    default Optional<Integer> getMinScheduleSplitBatchSize()
-    {
-        return Optional.empty();
-    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java
index 1ced4adb69549..11479eb101e5c 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java
@@ -19,7 +19,6 @@
 
 import javax.inject.Inject;
 
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 import static java.util.Objects.requireNonNull;
@@ -60,12 +59,4 @@ public boolean isFinished()
             return delegate.isFinished();
         }
     }
-
-    @Override
-    public Optional<Integer> getMinScheduleSplitBatchSize()
-    {
-        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getMinScheduleSplitBatchSize();
-        }
-    }
 }