* Make undeletion (more or less) work with new schema