Happy return for Raonic after two-year heartbreak