Revert "Merge pull request #31 from sebgie/issue#28"

This reverts commit 173aef001ba4096dfa67b134f39bf13555ac47b8, reversing
changes made to 997bbd21328a2ccfb5902098c9584f79bf903c46.