Ever since they made that misake, they've tried to rectify that mistake. Even when Austin came back from the walk out at No way out 03...they still went with the Rock/Hogan rematch over that and all their world titles.If the HHH/Y2J title match headlined WM18 over ROCKY/Hoegan, there’s no reason they couldn’t do the same for Punk as champion. This goes for anyone as champ heading into WM.