Revert "Database:"

This reverts commit f7c0b177c2a17710be6dbd853fd9beecc233ee4a, reversing
changes made to 1953ad05186b8f34e68158ecdfea1d239090400a.