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

This reverts commit 443d9f0d4349edb7b1086c1c52c3994b4ddc15b6, reversing
changes made to 06d5d6dbf187db4fa692da6fda1187f9e1661770.