Conversation so far:

Question: What did he do upon his return?
Self-contained rewrite: What did he do upon his return?