Gwinn makes comeback for FC Bayern