@witty-crayon-22786/@rough-minister-58256 I made some non-trivial modifications to https://github.com/pantsbuild/pants/pull/5994 since review, but CI is now green! Last look before I merge?

merged. thanks!