Revert "Oops, forgot to fix this file..."

This reverts commit 53679779de9ef9a1849ece12c4eb957c6e16e7bd.
Revert "I've solved the DBConnection crisis... I'll send out an email explaining changes."

This reverts commit b37e014ca028024dca782c34935b110f25dc844b.