diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 53998b541f..847b1ac69f 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -256,21 +256,15 @@ public interface DSLContext {
      * <li> <code>{@link RenderContext#declareTables()} == false</code></li>
      * </ul>
      * <p>
-     * RenderContext for JOOQ INTERNAL USE only. Avoid referencing it directly
+     * BindContext for JOOQ INTERNAL USE only. Avoid referencing it directly
      */
     BindContext bindContext(PreparedStatement stmt);
 
     /**
-     * Get a new {@link BindContext} for the context of this executor.
-     * <p>
-     * This will return an initialised bind context as such:
-     * <ul>
-     * <li> <code>{@link RenderContext#declareFields()} == false</code></li>
-     * <li> <code>{@link RenderContext#declareTables()} == false</code></li>
-     * </ul>
-     * <p>
-     * RenderContext for JOOQ INTERNAL USE only. Avoid referencing it directly
+     * @deprecated - [#2662] - 3.2.0 - Do not reuse this method. It will be
+     *             removed with jOOQ 4.0
      */
+    @Deprecated
     int bind(QueryPart part, PreparedStatement stmt);
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
index bf4f425532..2d22946dfb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
@@ -40,6 +40,7 @@ import static org.jooq.conf.ParamType.INDEXED;
 import static org.jooq.conf.ParamType.INLINED;
 import static org.jooq.conf.SettingsTools.executePreparedStatements;
 import static org.jooq.conf.SettingsTools.getParamType;
+import static org.jooq.impl.DSL.using;
 import static org.jooq.impl.Utils.DATA_COUNT_BIND_VALUES;
 import static org.jooq.impl.Utils.DATA_FORCE_STATIC_STATEMENT;
 
@@ -291,7 +292,7 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query, Attacha
                     !Boolean.TRUE.equals(ctx.data(DATA_FORCE_STATIC_STATEMENT))) {
 
                     listener.bindStart(ctx);
-                    create(c).bind(this, ctx.statement());
+                    using(c).bindContext(ctx.statement()).bind(this);
                     listener.bindEnd(ctx);
                 }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index b6246d667e..4f29326a39 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -39,6 +39,7 @@ import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.impl.DSL.function;
 import static org.jooq.impl.DSL.table;
+import static org.jooq.impl.DSL.using;
 import static org.jooq.impl.DSL.val;
 
 import java.sql.CallableStatement;
@@ -268,7 +269,7 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
             listener.prepareEnd(ctx);
 
             listener.bindStart(ctx);
-            create(configuration).bind(this, ctx.statement());
+            using(configuration).bindContext(ctx.statement()).bind(this);
             registerOutParameters(configuration, (CallableStatement) ctx.statement());
             listener.bindEnd(ctx);