Remove x86 dependency on some packages (#3256)