As mentioned above, I am on release duty today. I won't be able to start until 4-5 EST. In the meantime, if anyone could review https://github.com/pantsbuild/pants/pull/4167, I have added it to the backport list for 1.2.1rc1, which I hope to cut alongside the dev release.