Comment 88 for bug 736743

Oh and this is not a complete solution in any way as there are those grub environment tools that you can use on runing system that would need a fix too. So final solution could be a setting on /etc/default/grub that controls between the default location and ESP location.