Merge "Remove useless x86 fallbacks."