Second attempt to fix Mac OS build