Reverted r7280 and r7281 as this fix was flawed.
The command used was: svn merge -r7281:7279 .
Authored by: bugman 2008-09-24
Parent: [r7281]
Child: [r7283]
