can you drop this change? I updated this stuff in a recent pull request that was merged.  If you rebase you'll pickup these changes.