A two-year travesty comes to an end as Toblerone reverts to its original shape