Bringing the Davis affair to an end