Revert "Database crazy person fixes :) ( <3 kevin)"

This reverts commit 271dfd318c30b999e73982c825e312fc3cdd4a47.