Revert "Codinalte:Restore old charging fix"

This reverts commit deeec2aa4dd7a5a56e51a4e5c64f808cc2ca8b25.