0.11-stable: Backed out [8184] due to #8282. I'll propose a better fix in #5640.
Authored by: rblank 2009-05-12
Parent: [r8197]
Child: [r8199]