Merge "Revert "Optimizing: Fix long-to-fp conversion on x86.""