Revert "Revert "package fix...""

This reverts commit c1eec2dc0d9b070131ac04dd6677e43719f803ad.