fix and clean up the monkey patch (no need to patch Database)
Merge pull request #2 from dimagi/fix-monkey

fix and clean up the monkey patch (no need to patch Database)