Revert "Revert "back to old db""

This reverts commit abf6dcd21371ddef76e2046ccfbbd43c06ede78d.