Rolled back user db

In preparation for switching back to master branch