You managed ORD-PVG-ORD? Isn't that the same plane turn in just 2 hours?
Yeah, think it was a little longer back then, but it was a perfectly legal connection and on same ticket. APEC card acts as a Chinese visa as well, so that helps
ETA: Oh, and there was a couple of misconnects so ended up going via MIA for one or two of them... have to dig it up and see now!