Revert "fixes #11, this commit is going away when the PR is merged upstream"

The PR was merged upstream.

This reverts commit a33044624f5cd19af68a53ee39dceedc4ade652d.