Merge "Revert "Fix CFI initialization crash on x86.""