I'm closing https://github.com/pantsbuild/pants/pull/10830 and replacing it with https://github.com/pantsbuild/pants/pull/10845 since that's a cleaner way to solve the problem, thanks @witty-crayon-22786