Is Gideon coming back?

I've been hearing rumors that he is supposed to come back for an episode in season seven, but I'm not sure about that. And when I try to research him coming back, all I get is him coming back for the two episodes he was in from season three. Any help? Please, it's really bugging me!!!