[x86] Fix another bug hit when bootstrapping with the new shuffle