i discovered in a sandbox overnight that i should probably revert https://github.com/pantsbuild/pants/pull/4624 and re-land it in a different form, so i'll get that out now.