Revert "Force fix for new databases"

This reverts commit bb721dd50c2a7e59cdafab1623fb2792c009d57c.