Revert "Merge pull request #29 from cgroer/master"

This reverts commit fa8dce217b1f4290b0bc0f2d6d7b8849d5d9b2c9, reversing
changes made to 625e5fee75ec7ab62070c5bd7353f988415aa8df.