This reverts commit c96738a6e9. This breaks grub-install currently; a temporary rollback until it is properly fixed.
c96738a6e9