Revert r5582. Better discuss this on Trac-dev first, no?
Authored by: cboos 2007-06-05
Parent: [r5583]
Child: [r5585]