Creator Jenji Kohan has already revealed that a number of familiar faces will return for the Weeds series finale, and now she's identified at least one of them:
Diaz, who now stars on ABC's Scandal, will reprise the role of drug dealer Guillermo Garcia Gómez, who viewers last saw getting arrested in Season 6
"I just think Nancy and Guillermo have circled each other for so many years," Kohan teased to TV Guide of the state of their relationship. "It's time that they just accept the fact that they're going to be in each other's lives."
Diaz will first appear again on the September 9 installment of Weeds, its 100th episode, which takes Nancy back to Agrestic. He will also play a role on the two-part September 16 finale.