Anthony Johnson has signed a new deal with the UFC.

“Rumble” will make his Octagon return this April against Phil Davis at UFC 172. The card takes place in Baltimore and features a main event pitting UFC light heavyweight champion Jon Jones against Glover Teixeira.

Johnson (16-4) went 7-4 during a prior run with the promotion, including wins over Dan Hardy and Charlie Brenneman. However, he struggled with making the 170-pound welterweight limit and was released after missing weight battle – and losing – to Vitor Belfort in 2012.

After that, Johnson moved to Titan Fighting Championships where he defeated David Branch and Esteves Jones. He moved on to Xtreme Fight Night, knocking out Jake Rosholt, before winning three straight in the World Series of Fighting.

Johnson finished Mike Kyle last month by first round knockout, and also defeated former UFC heavyweight champion Andrei Arlovski.

“As most of you know I’m back in the UFC and will be fighting Phil Davis,” Johnson wrote on his personal Facebook page. “I’m blessed for the opportunity I have received. Thank you to all my supporters and doubters….and thank you to the UFC, Phil Davis, the Blackzilians, Glenn Robinson and ASM.

“Also would like to thank WSOF for being a awesome organization and helping me improve my career and my life. Much respect to everybody.”

In Davis, Johnson will be facing a top contender at 205 pounds. “Mr. Wonderful” is coming off a decision victory over Lyoto Machida in Brazil and holds an overall mark of 12-1, including eight wins in nine UFC fights.

Davis’ lone career loss came to former UFC champion Rashad Evans.