https://github.com/pantsbuild/pants/pull/8006 << would appreciate any eyes on this that people have to lend, as it’s kind of weird and subtle.