Merge "Revert "Add X86 target changes""