Prosecutors in Washington, D.C., on Tuesday abandoned two felony assault charges against a lawyer in exchange for a guilty plea to misdemeanor disorderly conduct, an agreement that ends a case that the presiding judge did not want to see go to trial.

The defendant, Ning Ye, a solo defense and human rights lawyer who is licensed in New York, was charged in October 2008 for a skirmish that happened months earlier in the vestibule of a courtroom in the U.S. District Court for the District of Columbia.