Merge "Revert "Fix compilation issues on x86_64""