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

This reverts commit dd3ceea6cae59ce88470985693fa221a4e377c05, reversing
changes made to 3869e61bcce8477d27eaef9629ee07666d63c47b.