Revert "RE: DB v7"

This reverts commit 3dc2d81f671cc3e81df01ad12b6bc78b9e69f9eb.