[X86] Fixes commit r214890 to match the posted patch