Oops, revert changes that accidentally slipped in r3436.
Authored by: cboos 2006-06-22
Parent: [r3436]
Child: [r3438]