Jeff Hardy vs Cm Punk at WM 26 was ever planned?

[bluebeach25]

Let's say Jeff would have had his Retirement Match at Wrestlemania 26 instead of the Summer of 09. Would they have had the Punk Feud until Mania or someone else?