More likely both.
Anyway, i just notice something that on the first episode Roshi said he can feel Goku's ki which mean it could be the same ki before he left in the EoZ? Does that mean Goku didn't get stronger from 5 years?
17 mins, 17-28 secs;
Goku: ''You're the same as ever, huh Old Timer?''
Roshi: ''Hold on, I've seen that face before somewhere...''
Goku: ''I'm Son Goku.''
Roshi: ''What? Son Goku? That is Goku's ki all right...
As for the second episode,
Goku: ''I could use the Earth Dragon Balls to relocate to some other planet, right?'' Can Goku ask Shenron to collect the Black Star Dragon Balls and return it to Earth?