https://github.com/pantsbuild/pants/pull/6636 looks landable now! please hold off on further merges until it goes green