x86: remove X2 workaround