Revert "Merge pull request #4 from divemonkey/master"

This reverts commit a8996f253eae47845a13487bd70c02bc2a5a7636, reversing
changes made to 6d9beba613eadf15c2fc8cbf489a12096ee448d2.