Re-commit for compatible with iOS build