Backported "Fix for missing curl requirement."