Johnson Steps down as Special Rapporteur