Oops, account for elf rebase