(entirely untested) fix to the 2-timeouts issue.  breaks interface.