Remove grub conflict (see 22.8-10)