Revert some charger changes