Revert "Merge pull request #26 from andyburke/master"

This reverts commit ef7929a1c9029b1d6b09775f1202cee45aaa07f6, reversing
changes made to f7f8a7b0bf1b59ac7c811f22b91d198db1c432fb.