NXT's Roadblock on the way to Stand & Deliver went down last night. A souped-up edition of the weekly show which included some big matches, a first look at Dragon Lee on NXT TV, and the biggest edition of The Grayson Waller Effect to date. That's because Shawn Michaels was the special guest after he and Waller have been butting heads for weeks.

Shawn Michales Ain't Wrestling Again

Many fans will have assumed the segment was designed to set up a match between the two, even though HBK has continually shot down requests to return for one more bout. Michaels even referenced that when Waller did the inevitable and tried to convince the man he once considered a hero to face him at Stand & Deliver.

RELATED: Johnny Gargano’s WWE Return Has Been Underwhelming So Far

The in-house fans were naturally pretty disappointed when HBK turned down Waller's challenge, especially after the man now running NXT took his jacket off, signifying he was in the mood for a fight. That disappointment didn't last for long as Michaels came with a plan. An even more fitting opponent for Waller at Stand & Deliver.

Johnny Gargano Is Back In NXT

HBK exclaimed the man Waller will face at NXT's WrestleMania weekend event has the brand's blood coursing through his veins, and he's not wrong. Michaels gestured to the entranceway, at which point Johnny Gargano's music hit. The crowd erupted and the former NXT Champion sprinted to the ring, finally being given a window to get some long-overdue revenge on Waller.

The last time Gargano was in NXT was more than a year ago. A few days after competing in WarGames, Gargano bid an emotional farewell to the brand as his contract was about to come to an end. Waller interrupted that farewell, leaving Gargano laid out in the ring. When Johnny Wrestling returned, it was on the main roster, leaving his NXT run open-ended. He now has the chance to officially close that chapter by facing Waller at Stand & Deliver.