Revert r6104 "Merged r6098 from trunk."
I messed things up with a cherry-pick on master, I'll re-apply it after.
Authored by: jbbarth 2011-06-21
Parent: [r6104]
Child: [r6106]