Revert "Merge pull request #89 from dylan/master"

This reverts commit 552a8e0c230d7512092007d3f7a59389d8749ad7, reversing
changes made to d0f3ae6c80f61a7dadf650af9597c5a529ebf45e.