This matches the fix in initcpiocfg. I had to create an encrypt_hook_nokey that is a copy of encrypt_hook without the part that copies the keyfile.