undo changeset:11658 - causes kexec crash anyway