revert charging commit, since it leads to crashes with: TOA AVG is not 16 qbits, correcting (got 15)