Revert "Merge pull request #2 from Noitidart/master"

This reverts commit 5c74fb980d9e5336bd626779bfdd1bbf055d56e6, reversing
changes made to 35af9c0a98abdf3a1a08357effd8a4128d4bed0e.