diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 3950411aa..276151075 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -606,13 +606,6 @@ public class DatabasePlatform {
     this.useMigrationStoredProcedures = useMigrationStoredProcedures;
   }
 
-  /**
-   * Normally not needed - overridden in CockroachPlatform.
-   */
-  public boolean isDdlAutoCommit() {
-    return false;
-  }
-
   /**
    * Return the DB identity/sequence features for this platform.
    *
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
index 06e775dae..e388f87f6 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
@@ -14,12 +14,4 @@ public class CockroachPlatform extends PostgresPlatform {
     this.historySupport = null; // not yet implemented in DDL
   }
 
-  /**
-   * Needs a commit after create index such that alter table add foreign key ... succeeds.
-   */
-  @Override
-  public boolean isDdlAutoCommit() {
-    return false;
-  }
-
 }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 9e6d7ea28..7a19240e8 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -44,7 +44,6 @@ public class DdlGenerator implements SpiDdlGenerator {
   private final boolean extraDdl;
   private final boolean createOnly;
   private final boolean jaxbPresent;
-  private final boolean ddlAutoCommit;
   private final String dbSchema;
   private final ScriptTransform scriptTransform;
   private final Platform platform;
@@ -70,11 +69,9 @@ public class DdlGenerator implements SpiDdlGenerator {
     if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) {
       log.warn("DDL can't be run on startup with TenantMode " + config.getTenantMode());
       this.runDdl = false;
-      this.ddlAutoCommit = false;
       this.useMigrationStoredProcedures = false;
     } else {
       this.runDdl = config.isDdlRun();
-      this.ddlAutoCommit = databasePlatform.isDdlAutoCommit();
       this.useMigrationStoredProcedures = config.getDatabasePlatform().isUseMigrationStoredProcedures();
     }
     this.scriptTransform = createScriptTransform(config);
@@ -166,11 +163,11 @@ public class DdlGenerator implements SpiDdlGenerator {
 
     DdlRunner runner = createDdlRunner(expectErrors, scriptName);
     try {
-      if (expectErrors || ddlAutoCommit) {
+      if (expectErrors) {
         connection.setAutoCommit(true);
       }
       runner.runAll(scriptTransform.transform(content), connection);
-      if (expectErrors || ddlAutoCommit) {
+      if (expectErrors) {
         connection.setAutoCommit(false);
       }
       connection.commit();