@aloof-angle-91616: i went ahead and cherry-picked https://github.com/pantsbuild/pants/pull/6464 to 1.9.x... please sync with John re: the setup.py stuff (cc'd you on a github comment)