Federer switching back to 90