This reverts commit 1422fce0db, reversing changes made to 9d2d1fffdf.
1422fce0db
9d2d1fffdf
[SVN r24096]
[SVN r15745]