diff --git a/hidden.cfg b/hidden.cfg
index fb79657..997426d 100644
--- a/hidden.cfg
+++ b/hidden.cfg
@@ -740,10 +740,11 @@ package {
 
 package {
   name: "javapackages-bootstrap"
-  type: PACKAGE_TYPE_NORMAL_FORK
+  type: PACKAGE_TYPE_NORMAL_FORK_MODULE
   repository {
     name: "hidden"
     include_filter: "javapackages-bootstrap.noarch"
+    include_filter: "javapackages-bootstrap-openjdk8.noarch"
   }
 }
 
@@ -2490,12 +2491,3 @@ package {
     include_filter: "extra-enforcer-rules-javadoc.noarch"
   }
 }
-package {
-  name: "javapackages-bootstrap"
-  type: PACKAGE_TYPE_NORMAL_FORK_MODULE
-  repository {
-    name: "hidden"
-    include_filter: "javapackages-bootstrap.noarch"
-    include_filter: "javapackages-bootstrap-openjdk8.noarch"
-  }
-}