I've dusted off: https://github.com/pantsbuild/pants/pull/23024 (which I was originally trying to do before 2.31) and it is ready for review now.