h
Oh boy
h
I think I found a fix, testing in CI on a branch build: https://github.com/pantsbuild/pants/runs/3082413145