Yep, in 2005, everyone thought it would be Hillary versus Rudy.
In 2008 everyone thought it would Hillary and not Obama.