revert 6729, which fixed a problem that wasn't, and fixed it badly
Authored by: jpaetzel 2011-06-30
Parent: [r6852]
Child: [r6854]
