Federer switching back to Pro Staff