Re: Sub-package dropped upstream