Requires bootloader!6 (merged) and bootloader-efi!4 (merged)
This will create a new commit in order to revert the existing changes.