Fixed timer removal problems.

Instead of setting the timer value to 0, resets its value to the
default_timeout setting.
Also update the timer when processing ACK in order for the new timeout
to be taken into account