Remove check and patching of i386