Revert "Merge pull request #137 from cuckoobox/bson"

This reverts commit 0cd07d7b15329468b7b0e842ef44d0e1e781d7c6, reversing
changes made to 9a24b4de8f82d32b4ebf58c853e4ba6c3dd0d0a9.