diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
index 4cd5028958..448ec8eff5 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
@@ -70,7 +70,6 @@ abstract class AbstractGenerator implements Generator {
     boolean                            generateGlobalSequenceReferences = true;
     boolean                            generateGlobalTableReferences    = true;
     boolean                            generateGlobalUDTReferences      = true;
-    boolean                            generateJavaTimeTypes            = true;
     boolean                            fluentSetters                    = false;
     String                             fullyQualifiedTypes              = "";
 
@@ -304,16 +303,6 @@ abstract class AbstractGenerator implements Generator {
         this.fullyQualifiedTypes = fullyQualifiedTypes;
     }
 
-    @Override
-    public boolean generateJavaTimeTypes() {
-        return generateJavaTimeTypes;
-    }
-
-    @Override
-    public void setGenerateJavaTimeTypes(boolean generateJavaTimeTypes) {
-        this.generateJavaTimeTypes = generateJavaTimeTypes;
-    }
-
     // ----
 
     @Override
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index 8d8d80619a..2453cdda2a 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -412,18 +412,6 @@ public class GenerationTool {
                 generator.setGeneratePojosEqualsAndHashCode(g.getGenerate().isPojosEqualsAndHashCode());
             if (g.getGenerate().getFullyQualifiedTypes() != null)
                 generator.setFullyQualifiedTypes(g.getGenerate().getFullyQualifiedTypes());
-            if (g.getGenerate().isJavaTimeTypes() != null)
-                generator.setGenerateJavaTimeTypes(g.getGenerate().isJavaTimeTypes());
-
-            /* [java-8] */
-            if (true)
-                ;
-            else
-            /* [/java-8] */
-                if (!Boolean.FALSE.equals(g.getGenerate().isJavaTimeTypes())) {
-                    log.warn("INVALID CONFIG", "The java.time API cannot be used in the Java 6 distribution of jOOQ 3.7+");
-                    generator.setGenerateJavaTimeTypes(false);
-                }
 
             if (Boolean.TRUE.equals(g.getGenerate().isJpaAnnotations()))
                 log.warn("DEPRECATED", "The <jpaAnnotations/> flag is deprecated and used for backwards-compatibility only. It will be removed in the future.");
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
index f6e8807d73..8fdd65fe6e 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
@@ -106,7 +106,6 @@ public interface Generator {
     void setGenerateGeneratedAnnotation(boolean generateGeneratedAnnotation);
 
     boolean useSchemaVersionProvider();
-
     void setUseSchemaVersionProvider(boolean useSchemaVersionProvider);
 
     /**
@@ -265,22 +264,6 @@ public interface Generator {
      */
     void setFullyQualifiedTypes(String fullyQualifiedTypes);
 
-    /**
-     * A flag indicating whether Java 8's java.time types should be used by the
-     * source code generator, rather than JDBC's java.sql types.
-     * <p>
-     * This flag is ignored in the commercial Java 6 distribution of jOOQ 3.7+
-     */
-    boolean generateJavaTimeTypes();
-
-    /**
-     * A flag indicating whether Java 8's java.time types should be used by the
-     * source code generator, rather than JDBC's java.sql types.
-     * <p>
-     * This flag is ignored in the commercial Java 6 distribution of jOOQ 3.7+
-     */
-    void setGenerateJavaTimeTypes(boolean generateJavaTimeTypes);
-
     /**
      * The target directory
      */
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index 81ffd36d92..17099c3384 100644
--- a/jOOQ-meta/pom.xml
+++ b/jOOQ-meta/pom.xml
@@ -47,7 +47,7 @@
                             <schemaDirectory>src/main/resources/xsd</schemaDirectory>
                             <bindingDirectory>src/main/resources/xjb/codegen</bindingDirectory>
                             <schemaIncludes>
-                                <include>jooq-codegen-3.7.0.xsd</include>
+                                <include>jooq-codegen-3.6.0.xsd</include>
                             </schemaIncludes>
                             <generatePackage>org.jooq.util.jaxb</generatePackage>
                             <args>
diff --git a/jOOQ-meta/src/main/resources/xjb/codegen/binding.xjb b/jOOQ-meta/src/main/resources/xjb/codegen/binding.xjb
index 18556a2edd..8ff43e6953 100644
--- a/jOOQ-meta/src/main/resources/xjb/codegen/binding.xjb
+++ b/jOOQ-meta/src/main/resources/xjb/codegen/binding.xjb
@@ -11,7 +11,7 @@
     <jaxb:globalBindings>
  
         <!-- Force all classes implements Serializable -->
-        <xjc:serializable uid="370" />
+        <xjc:serializable uid="360" />
         
         <!-- [#2401] Trim unnecessary whitespace from configuration -->
         <xjc:javaType name="java.lang.String" xmlType="xs:string" adapter="org.jooq.util.jaxb.tools.TrimAdapter"/>
@@ -19,7 +19,7 @@
  
  
     <!-- Annotate the following classes with @SuppressWarnings -->
-    <jaxb:bindings schemaLocation="../../xsd/jooq-codegen-3.7.0.xsd" multiple="true" node="//xs:complexType">
+    <jaxb:bindings schemaLocation="../../xsd/jooq-codegen-3.6.0.xsd" multiple="true" node="//xs:complexType">
         <annox:annotate>
         	<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" />
         </annox:annotate>