x86: undo visws/numaq build changes