On February 29, 2012, All Japan Pro Wrestling announced that Raijin would be returning to the promotion from his American excursion on March 20.
In his return match, Raijin teamed with Kaz Hayashi and Minoru Tanaka in a losing effort against the team of Gillette, Hiroshi Yamato and Kai, with Gillette pinning Raijin for the win.
On April 1, Kawabata debuted as the masked character Sushi, when he entered the 2012 Junior Tag League alongside Bushi.
Sushi and Bushi made it all the way to the finals of the tournament on April 14, where they were defeated by Kaz Hayashi and Shuji Kondo.
In July, Sushi took part in the 2012 Junior Hyper League, where he finished with a record of three wins and two losses, failing to advance from his round-robin block.
Following Bushi's departure from All Japan, Sushi formed a new partnership with rookie Andy Wu, with the two taking part in the Junior Hyper Tag League in early 2013, where they failed to advance to the finals.
On April 26, Kawabata as Sushi received his first shot at the World Junior Heavyweight Championship, but was defeated by the defending champion Yoshinobu Kanemaru.
Sushi re-entered the title picture on October 12 by pinning Kanemaru in a six-man tag team main event.
Sushi received his title shot on October 27, but was again defeated by Kanemaru.

Afterwards, Sushi began petitioning for All Japan to restore the Gaora TV Championship, which had been quietly sidelined earlier in the year.
After its restoration, Sushi entered a four-man tournament for the vacant title, defeating Hikaru Sato in his semifinal match on November 21.
Three days later, Sushi defeated Dramatic Dream Team (DDT) representative Keisuke Ishii in the finals to win the tournament and become the third Gaora TV Champion.
Sushi made his first successful title defense on January 3, 2014, against another DDT representative, Soma Takao.
On February 23, Sushi, alongside Menso～re Oyaji, received his first shot at the All Asia Tag Team Championship.
The two were, however, defeated by the defending champions, Burning (Jun Akiyama and Yoshinobu Kanemaru).
On May 17, Sushi lost the Gaora TV Championship to Kotaro Suzuki in his second defense.
On December 14, Sushi put his mask on the line in a tag team match, where he and "Mr. Christmas" faced Último Dragón and Masked Burning #2.
Though Sushi was pinned for the win by Dragón and was per stipulation supposed to unmask himself, Mr. Christmas instead offered to unmask in his place, revealing himself as Jun Akiyama.
On June 4, 2015, Sushi defeated Kenso to win the Gaora TV Championship for the second time.
On August 15, Sushi fractured his jaw in a match, which sidelined him indefinitely and forced him to forfeit the Gaora TV Championship.
He made his return to in-ring action on November 1.
On January 15, 2017, AJPW announced that Sushi would be leaving the promotion at the end of the month and becoming a freelancer.
On January 28, Sushi was defeated by Jun Akiyama in his final AJPW match.
On February 29, 2012, All Japan Pro Wrestling announced that Raijin would be returning to the promotion from his American excursion on March 20. In his return match, Raijin teamed with Kaz Hayashi and Minoru Tanaka in a losing effort against the team of Gillette, Hiroshi Yamato and Kai, with Gillette pinning Raijin for the win. On April 1, Kawabata debuted as the masked character Sushi, when he entered the 2012 Junior Tag League alongside Bushi. Sushi and Bushi made it all the way to the finals of the tournament on April 14, where they were defeated by Kaz Hayashi and Shuji Kondo. In July, Sushi took part in the 2012 Junior Hyper League, where he finished with a record of three wins and two losses, failing to advance from his round-robin block. Following Bushi's departure from All Japan, Sushi formed a new partnership with rookie Andy Wu, with the two taking part in the Junior Hyper Tag League in early 2013, where they failed to advance to the finals. On April 26, Kawabata as Sushi received his first shot at the World Junior Heavyweight Championship, but was defeated by the defending champion Yoshinobu Kanemaru. Sushi re-entered the title picture on October 12 by pinning Kanemaru in a six-man tag team main event. Sushi received his title shot on October 27, but was again defeated by Kanemaru.
Afterwards, Sushi began petitioning for All Japan to restore the Gaora TV Championship, which had been quietly sidelined earlier in the year. After its restoration, Sushi entered a four-man tournament for the vacant title, defeating Hikaru Sato in his semifinal match on November 21. Three days later, Sushi defeated Dramatic Dream Team (DDT) representative Keisuke Ishii in the finals to win the tournament and become the third Gaora TV Champion. Sushi made his first successful title defense on January 3, 2014, against another DDT representative, Soma Takao. On February 23, Sushi, alongside Menso～re Oyaji, received his first shot at the All Asia Tag Team Championship. The two were, however, defeated by the defending champions, Burning (Jun Akiyama and Yoshinobu Kanemaru). On May 17, Sushi lost the Gaora TV Championship to Kotaro Suzuki in his second defense. On December 14, Sushi put his mask on the line in a tag team match, where he and "Mr. Christmas" faced Último Dragón and Masked Burning #2. Though Sushi was pinned for the win by Dragón and was per stipulation supposed to unmask himself, Mr. Christmas instead offered to unmask in his place, revealing himself as Jun Akiyama. On June 4, 2015, Sushi defeated Kenso to win the Gaora TV Championship for the second time. On August 15, Sushi fractured his jaw in a match, which sidelined him indefinitely and forced him to forfeit the Gaora TV Championship. He made his return to in-ring action on November 1. On January 15, 2017, AJPW announced that Sushi would be leaving the promotion at the end of the month and becoming a freelancer. On January 28, Sushi was defeated by Jun Akiyama in his final AJPW match.
Akira Raijin