Reverted r17957 and r17958 as these are no longer compatible with the previous reversion.
The command used was: svn merge -r17958:r17956 .
Authored by: bugman 2012-11-14
Parent: [r17965]
Child: [r17967]
