Backport a PLIST fix (change in build components fetched at build time)