I don't expect it to otherwise be working, but in case it helps, here is my current working state: https://github.com/pantsbuild/pants/commit/52906dbc778da1c175422f2d1906d08d52667a8d#diff-ca5c5012c3bde561e871385ac[…]3f681b44a5dcd5afd5299092f8cf34f