So, I just re-watched the episode. One thing I didn't think about before was the fact he went to Skarro. I don't think that was a dream world like the stuff in the prequels. But, if that is the case, visiting Skarro would only be possible if Moffat has written--at least--the stupid Time Lock out of continuity. Maybe, that means the Time Lords are back now. Just a thought.