UFC on FOX 7 is getting a little more hometown flavor as former Strikeforce Lightweight Champion Josh Thomson will be making his Octagon return at the network-televised event which goes down on April 20, 2013 from the HP Pavilion in San Jose, Calif.

His opponent?

None other than former Ultimate Fighting Championship (UFC) No. 1 lightweight contender, and Cesar Gracie Fight Team member, Nate Diaz.

Csnbayarea.com brought word of the 155-pound matchup earlier today.

Diaz is coming off a lopsided unanimous decision loss to current UFC lightweight kingpin Ben Henderson at UFC on FOX 5 this past December, which went down at KeyArena in Seattle, Washington. The loss to "Smooth" snapped his three-fight win streak since his return to the division after suffering two consecutive defeats at welterweight.

"The Punk," meanwhile, has gone an even 3-3 in his last six outings and was last seen taking on Diaz teammate Gilbert Melendez for the third time for the now-defunct promotion's 155-pound title at Strikeforce: "Barnett vs. Cormier" last May.

Josh came up short to "El Niño" in what many believed was a controversial split decision.

Previously, Thomson racked up a 2-1 record during his first 11-month stint with UFC, picking up wins over Gerald Strebendt at UFC 44 and Hermes Franca at UFC 146 before getting knocked out by Yves Edwards at UFC 49.

UFC on FOX 7 features a lightweight championship fight between the aforementioned Henderson looking to defend his title against Gilbert Melendez while Daniel Cormier and Frank Mir co-headline the event in a pivotal heavyweight showdown.

How about it Maniacs, does this 155-pound showdown tickle your fancy?