While testing Trac for r6123, I didn't notice any difference with or without r4886, therefore I'm reverting that change.
It seems that the reason for #4465 was different anyway, but I can't reproduce that timeout problem anymore.
Authored by: cboos 2007-11-06
Parent: [r6123]
Child: [r6125]
