Gah, the original PR got into some bad state where github wasn't seeing pushes to it and so not retriggering CI. Can I get a review on https://github.com/pantsbuild/pants/pull/10363 instead?