Properly clear timeout (related to issue 6942)