Sounds like he's back on the same card but fighting BJ Penn. Carlos Condit is taking his place to fight GSP. For some strange reason i am a bit disappointed that there's no GSP/Diaz and i'm not sure if we'll see it even if both fighters win their respective fights. I get the feeling that once you spurn White there's no coming back. Although, stranger things have happened.