Revert "Merge pull request #65 from pallxk/3.0"

This reverts commit bf12fe0ec5ce7f85a736531f0bd02316beb35fa1, reversing
changes made to f650edef54b3561a2f74cd4dc6c9cfa998039cea.