Revert "Merge pull request #74 from Wlan1991/master"

This reverts commit 64a0595eff4cc14e8afb30e6fa6f50d54ea01485, reversing
changes made to 558edb21d095c54b6979f76b0aba1de83f2833da.