Merge "Revert "[optimizing] Enable x86 long support.""