Always apply this patch on the mac os branch