I've just tested this diff against head, built images, and setup ZFS on 2 systems booted in EFI mode. Works well. I have not tested in regular bios mode to see what would happen.