Redo timeout handling to avoid conflicting enable() calls.