Revert "back to old db"

This reverts commit d00845ca1083a35cdbaad2f92720ba55cd66cc99.