Yeah. I wonder if they meant to use that episode later, but moved it up for some reason--oh except it starts out with Amy floating in the sky, and she's in her nightie, so they must have known at production time that it would be the second one with her. Dunno. Makes no sense.
no subject