The Undertaker came to the rescue of the man who beat him at WrestleMania 33 to setup a tag team match for Extreme Rules next month.

Taker made the surprise appearance on Raw last night during the handicap match between Shane McMahon and Drew McIntyre vs Roman Reigns. The heels beat up Reigns, refusing to pin him and as Shane was ready to go coast to coast, the lights went out and Taker’s unmistakable “gong” sound hit the speakers. When the lights came back on, Taker was standing in the way, protecting Reigns. Shane went airborne anyway and Taker gave him a chokeslam. The legendary Superstar then cleaned house to even the odds.

A tag team match involving all four was then announced later in the broadcast.

This was The Undertaker’s first appearance since Super ShowDown and the disastrous match with Bill Goldberg.