I probably won't have connectivity to merge this: https://github.com/pantsbuild/pants/pull/12342