After speaking with Steve Langasek, I've attached a branch ( ~cody-somerville/grub/grub-fixlp291256) with a fix we feel would be best.
After speaking with Steve Langasek, I've attached a branch ( ~cody-somervill e/grub/ grub-fixlp29125 6) with a fix we feel would be best.