Revert "Merge pull request #4 from midnight88/jb2"

This reverts commit 761f8e1fca7e1a68adc7d310ceb65546236002a5, reversing
changes made to de421e02a0d0a4ca5ae1a9432425cb4dccf461b3.