Fix to handle changes to recreation key structure in kernel.