Revert "Merge pull request #2 from mrdejong/master"

This reverts commit 77654fbea2209b06c6a035f2882424d0831a702f, reversing
changes made to 919fa48f738735935bf0356bdae360a1c0c55ead.