Why isn't this just a cherry-pick of the work I did to fix this in Debian? -- https://code.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/+merge/362869 Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu.