Revert "Merge pull request #1 from 1hakr/dev"

This reverts commit b8ad5267a0703d64255d98e7e00b1f419384217b, reversing
changes made to cd693880bd5c5025ce7dad97be91c21468834329.