Revert "Merge pull request #223 from eric2892/master"

This reverts commit d75d147af8ae3e17dbd0a05c7756b3a510d0f8ea, reversing
changes made to 73978367994b5ef2fb4b4bb2d10bc1e3e950dbc5.
Merge pull request #230 from jayfo/fullrevert

Revert "Merge pull request #223 from eric2892/master"