Makes sense. FYI I'm pretty sure this is the culprit https://github.com/pantsbuild/pants/pull/15068 -- definitely curious if there is a better way to solve the original problem