[Timer] Attempt to make unbinding more reliable.