Merge "Revert "Deprecate PackageParser#Package""