Revert "Merge pull request #68 from mikehelix/master"

This reverts commit 4a76791d595d52d48cdb63ef648065b019e68df4, reversing
changes made to 81678caa15a6236c2b3e677d2fa012fe11bc736e.