Revert 171351. It broke MC/X86/x86-32-avx.s.