revert r4665 since it actually breaks the unit tests instead of fixing them
Authored by: mgood 2007-02-14
Parent: [r4758]
Child: [r4760]
