Revert to static DatabaseUtil