Dang it, I could have sworn I already fixed https://github.com/pantsbuild/pants/issues/14864 w/ round 1, but I guess not Imo we might want to do the rc today. I still have https://github.com/pantsbuild/pants/issues/14864 and the tags fixes