https://github.com/pantsbuild/pants/pull/6454 should pass ci because i skipped the only remaining failing test, but i'll figure it out if it doesn't