According to @WrestleVotes, WWE Hall Of Famer Shawn Michaels is indeed scheduled to wrestle in multiple matches as he makes his return to the ring. While it will all begin with an involvement in The Undertaker vs. HHH Match scheduled for The Australian Super Show-Down Event, the plan for his first official match back is a Tag Team Match at Crown Jewel on November 2nd where he will team up with Triple H to take on The Undertaker & Kane.
 
It was originally suggested that an actual singles one-on-one match against The Undertaker would likely not happen until next year, possibly at Royal Rumble or WrestleMania 35, but @WrestleVotes is suggesting that the “discussion is centered around Survivor Series” and that any potential HBK/Taker match will happen sooner than WrestleMania.