Revert "Merge pull request #78 from mcshaz/master"

This reverts commit afc92b2697246b91e560557bc98b323c0c78bed6, reversing
changes made to fb95d9fb4059480535c34214b0c3caa91a6c0f29.