Merge "pjproject_bundled: Replace earlier reverts with official fixes."