i haven't been able to reliably repro the error that https://github.com/pantsbuild/pants/pull/6388 fixes again, but we're still seeing it internally, so i'm thinking of merging that now since it definitely fixes something thanks to testing/review, and backporting that patch to a 1.9.1 release, and then making the 1.9.0 release now