so i believe this PR (which has a net line count of

+97

) fixes both of the

needs-cherrypick

PRs -- the jury's still out on ci since it's running on mine, but the description should make it clear why this might fix it https://github.com/pantsbuild/pants/pull/6217