Revert "Merge pull request #57 from mikz/patch-1"

This reverts commit 703f9bfda09ac665ff29bc58c262a82c2d6e0125, reversing
changes made to bdffc69de83b12adfaff2e728633e51cd597648c.