x86: switch image generation to new code