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

This reverts commit 55749b9f0f7ac6e2436ce91f8513d842c1b15e9d, reversing
changes made to aabbfdae44088d809b0c1c98fc5cc13151a2b315.