Revert "Do not reset counter expiration on incr/decr"

This reverts commit bcc8d00ea0518838a08f278a554a7a3e7109cc5a.