0.11.6dev: Fixed incorrect changes from [8831].
Re-closes #8240.
Authored by: rblank 2009-11-26
Parent: [r8856]
Child: [r8858]