simplify unnecessarily complex timeout-bypassing