Small reversal of changes to Settings and db.