Federer on Nadal return to ATP World Tour