Thanks for the quick response! I remember that part, but for some reason didn't make the connection.
I'm really gonna miss the old Mexico ride. I found it quite charming. I'm one cynical sonuva*****, but I loved it's quirky little film clips, fun music and the engaging dark ride setup (a rarity in Epcot). My girlfriend used to laugh at me for saying this (aloud), but that ride was tied with Spaceship Earth for my favorite ride at Epcot.