Saddleback is back, almost