Reverted -r18325 as this change breaks the GUI tests.
The command used was: svn merge -r18325:r18324 .
Authored by: bugman 2013-02-01
Parent: [r18333]
Child: [r18335]