Revert "DB/Misc: A lucky bag random fixes"

This reverts commit 3fcb1bf09140e59a878911cd889d5047cf8a0ca6.