x86: partly revert cabf775