diff --git a/javacc-wrapper.xml b/javacc-wrapper.xml
index a6a0ed316b..1710602b7e 100644
--- a/javacc-wrapper.xml
+++ b/javacc-wrapper.xml
@@ -220,7 +220,7 @@
         <!-- The tree builder is generic now -->
         <replaceregexp flags="g">
             <regexp pattern="\bJJT${parser-name}State\b" />
-            <substitution expression="${ast-impl-package}.JjtreeBuilder&lt;${base-class-name}, ${node-name}&gt;" />
+            <substitution expression="${ast-impl-package}.JjtreeBuilder&lt;${base-class-name}&gt;" />
             <fileset file="${parser-file}" />
         </replaceregexp>
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeBuilder.java
index 6b778542a7..7d14321302 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeBuilder.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeBuilder.java
@@ -11,9 +11,8 @@ import java.util.List;
  * Shared implementation of the tree builder generated by JJTree.
  *
  * @param <N> Internal base class for nodes
- * @param <P> Public interface for nodes
  */
-public final class JjtreeBuilder<N extends AbstractJjtreeNode<N, P>, P extends JjtreeNode<P>> {
+public final class JjtreeBuilder<N extends AbstractJjtreeNode<N, ?>> {
 
     private final List<N> nodes = new ArrayList<>();
     private final List<Integer> marks = new ArrayList<>();