revert r3875 due to problems reported in #4112
Authored by: mgood 2006-12-09
Parent: [r4429]
Child: [r4431]