USB chargung now works the normal way on AMSv2, so remove the hack that treated it...