Stitch attraction - the ending is different?

Is it my memory, or did the cartoon Stitch once crawl around Tomorrowland (specifically, the Astro-Orbiter) at the end of the filmed part of the ride? He now crawls around the castle, but not TL. Was this changed at some point? Maybe when they went to make the ride even more kid-friendly?

FWIW, my four year old has been tall enough for this ride for 13 months, but we've held him off it until now. He was brave and didn't clench up during the dark scenes, but came out not really liking the ride. They should raise the height limit, and shorten the dark scenes. Advice that also works for DAK's Dinosaur, but that's another story.