https://github.com/pantsbuild/pants/pull/6646 << I think this is reviewable now (just the HEAD commit, the rest is dependent PRs)