Revert "Merge pull request #2 from goebish/master"

This reverts commit 666db25588638d145dfa58da4097491b625f8291, reversing
changes made to c182ffefd43d692fe6749c737f196ebce061d4f9.