Grayling abandons attempt to remove choice of solicitor