Revert "Merge pull request #22 from sandal/patch-1"

This reverts commit 0b6b63f24a8a727e37497263a9e4172effc4da95, reversing
changes made to e2b99f5d33b6664b8cacd0db78c5c53a6c0412f2.