Follow-up to r3763, which was not 100% correct. Hopefully the final word on #3504...
Authored by: cboos 2006-09-25
Parent: [r3790]
Child: [r3792]