Revert "Revert "Force fix for new databases""

This reverts commit fa7be52fa71ab991d7911c558b05ed48f2a1cda3.