Trying that here and will reccommend if it demonstrably solves the package problem https://github.com/pantsbuild/pants/pull/6283/files