Revert "Merge pull request #53 from helicopter88/jb2"

This reverts commit fb7f447cecb6aa375290e2f8cd96a2bd09e4777f, reversing
changes made to f9fef2d7106420369da0553faec9feba5890caef.