Takanori Gomi
Castillo was briefly linked to a bout with Isaac Vallie-Flagg on April 26, 2014 at UFC 172. However, the UFC removed Vallie-Flagg from the bout in favor of a match up with Takanori Gomi, while Castillo instead fought against Charlie Brenneman. Castillo won the fight via knockout in the second round.