Switching to local patched version of working-on.

This commit should be reverted when upstream updates.