With fixes in place. Should unbreak the db.