Reapply r238011 with a fix for the trap instruction.