Olmert Plans Comeback to Challenge Netanyahu