x86: remove kludge from x86_64