When the UFC announced earlier this year that one of their all-time greatest champions would be returning to octagon after an almost four-year hiatus, the biggest question was: Who will Georges St-Pierre fight?

The original answer was Michael Bisping, in a surprising move up to middleweight for the former 170-pound kingpin. Even as late as a couple weeks ago, GSP told Goliath that he was still training with the thought of fighting the British champ later in 2017, probably in November or December.

Dana White, UFC president, has since said otherwise. With St-Pierre recovering from an eye injury (and Bisping recovering from a new injury of his own), White has shifted his plans. According to MMAJunkie, White is now hoping that GSP’s comeback fight will happen at welterweight, against the winner of the Tyron Woodley vs. Demian Maia championship fight that is scheduled to take place at UFC 214 on July 29.

“Georges and I talked a couple days ago when he was in Vegas,” White said. “Georges is saying he wants to fight; we’ll get this thing figured out. We’re talking about Tyron Woodley and Demian Maia. These two are going to fight soon. That will free up the 170-pound champion for Georges St-Pierre to return and try to regain his belt.”

The rumored date is be setting up a big card in November at Madison Square Garden, which would be the perfect venue for a returning GSP. St-Pierre was the UFC welterweight champion for almost six years straight, winning nine straight title defenses before walking away from the sport in 2013.

A big money fight with Georges St-Pierre would be exactly what Woodley has been campaigning for, and it puts even more at stake in the title fight against Maia at the end of July.