Revert "More Fast Charge related"

This reverts commit faf67484bb45ce85f578f99261215fb9672e5173.