Revert "Merge pull request #127 from nepeat/master"

This reverts commit 1b138af28c73e88fb63138ad20d910b494afa39b, reversing
changes made to dc268a3721ee1c805e3c2cc8c7882cecb7d15a97.