It will probably get resolved by https://github.com/pantsbuild/pants/issues/5763 but will need a ~trivial amount of additional work on top of that 🙂