WIP: changes to make eap image usable with sti