Revert "Remove vars for JDatabase" - They're used elsewhere

This reverts commit eeb7ee3b9e2d6472b8b1be0a0c5e14b77c722cf6.