Merge "Remove workaround for x86 ifunc"