Fix BC break regarding time-outs.