Another attempt to fix the Mac and iOS build following r230944