haven't looked at it yet... if you remove it, you can add the new commit to this pull request.