Sub-package dropped upstream