If you do the re-encryption this way you can remove Crypt::legacyKeyRecryptKeyfile() completely, right? Because that should be the only place where it was used.