ok, I’m going to drastically rewrite the history of https://github.com/pantsbuild/pants/pull/6660 and have it reviewable today/tomorrow 🙂