diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
index f4d1eaa1f5..6ece090e1a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
@@ -137,11 +137,6 @@ public abstract class AbstractDefinition implements Definition {
 
             String separator = "";
             for (Definition part : getDefinitionPath()) {
-                if (part instanceof CatalogDefinition && ((CatalogDefinition) part).isDefaultCatalog())
-                    continue;
-                else if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema())
-                    continue;
-
                 sb.append(separator);
                 sb.append(part.getInputName());
 
@@ -188,14 +183,8 @@ public abstract class AbstractDefinition implements Definition {
         if (qualifiedInputNamePart == null) {
             List<String> list = new ArrayList<String>();
 
-            for (Definition part : getDefinitionPath()) {
-                if (part instanceof CatalogDefinition && ((CatalogDefinition) part).isDefaultCatalog())
-                    continue;
-                else if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema())
-                    continue;
-
+            for (Definition part : getDefinitionPath())
                 list.add(part.getInputName());
-            }
 
             qualifiedInputNamePart = name(list);
         }