Add patch suggested from #4324 to fix broken macauth