Anyone else want to look at https://github.com/pantsbuild/pants/pull/4131 ?