Goldberg returned after 12 years at 'Survivor Series 2016'