Revert "Database Bug Fix"

This reverts commit 4a204d6bfd73da09bb3717e9ab6922f1089ca2c4.