Merge commit '33b458d276bb' into kvm-next

Fix bad x86 regression introduced during merge window.