planning to merge https://github.com/pantsbuild/pants/pull/5855 on green CI if anyone wants to give it one last peek, but I think it should be g2g