Thohir will return for Milan derby