Report: Nick Diaz set to return at UFC 235, agrees to face Masvidal