@average-vr-56795: do you want to re-review https://github.com/pantsbuild/pants/pull/5521 before i land it? unfortunately it was old enough that i had to squash it, so the history isn't useful