Unreviewed, attempt to fix iOS build after r188860