Revert "Use extracted DbScope"

This reverts commit c21ed42fd1e9949780be4dad0494b3e427bd8fbe.
Move to common