First attempt at resetting calls count.
(cherry picked from commit fb76e58c31e70323aaa5e591473bdd46e5941866)