[x86] Fix PR21139, one of the last remaining regressions found in the