Revert incorrect part of r4574 to avoid unaligned traps with i386 target