Revert "Merge pull request #27 from hermannloose/fix-26"

See #26 on why this wasn't such a good idea.

This reverts commit ad5e189cddb80e7e3cff06d1031a8aa7eacb54fb, reversing
changes made to dc21a5ddbd04910fbbee98d195e27ffd69869871.