Revert "Merge pull request #477 from xlexi/master"

This reverts commit c3352a50744d36370e658fa487cd149a45843548, reversing
changes made to 4f94baa7873ce4eb27fdc9c9e5f8424ce2d10be3.
Revert "Merge pull request #476 from xlexi/master"

This reverts commit 4f94baa7873ce4eb27fdc9c9e5f8424ce2d10be3, reversing
changes made to ba2789f1f9e500bf1dfac789f002dddc3f6bfa82.