Merge "Revert "Fix 64-bit host build.""