Reverted 5640-5649, going to create a feature branch for this work instead
Authored by: erikb78 2011-10-26
Parent: [r5649]
Child: [r5651]