On July 19, at the 2016 WWE draft, Henry was drafted to "Raw". On the August 1 episode of "Raw", Henry claimed he still "had a lot left in him" when he spoke of reviving the Hall of Pain and his participation in the Olympics. Raw General Manager Mick Foley gave Henry a United States Championship match, but Henry would lose by submission to Rusev. In October, Henry allied himself with R-Truth and Goldust in a feud against Titus O'Neil and The Shining Stars (Primo and Epico), in which Henry's team came out victorious. Henry returned at the Royal Rumble on January 29, 2017 as entrant number 6, only to be eliminated by Braun Strowman. He unsuccessfully competed in the Andre the Giant Memorial Battle Royal at WrestleMania 33.