this is actually also completely changed / fixed by https://github.com/pantsbuild/pants/pull/6275 too i think