Reverting r3794:3795, will solve #3778 differently.
Authored by: cboos 2006-09-27
Parent: [r3795]
Child: [r3797]