Eliminate the use of the global variable hack in the X86 target that was used