Put x86 hack back in