revert r4759's reversion or r4665 (fixes #4744)
Authored by: mgood 2007-02-15
Parent: [r4760]
Child: [r4762]