Both CM Punk and Roman Reigns brought back old themes for their World Heavyweight Championship match at WrestleMania.