Actually, the place where I can still find it is returning something like the old structure we were returning here -- possibly a reason to not change the structure ;-)