Best would be to merge after aports!64406 (closed) so we can remove origsubpackages too.
origsubpackages