x86: another attempt for #456
2 files changed