Err, Estrada gave him a very close fight eight years ago two weights below, and they've been going in opposite directions over the last few. Hardly a comeback story or "revenge", surely?
I'd also like to see Gonzales win this and look good mind you.