Revert "Merge pull request #1 from AntonJaie/master"

This reverts commit cb64653147691e99746f49befee81af54a5cdacb, reversing
changes made to e87c1d4f178cf3697467b579b412cde27ad493e9.