Revert to use DocumentDatabase