Merge "Quick fix for the x86 build."