Revert "Merge pull request #182 from eestrada/master"

This reverts commit 72431744c1077d84cb273f7617257804a45c0962, reversing
changes made to 40f5c302f6da4a640513066a3b847fc69e3923be.