This reverts commit a9a1eddba8, reversing changes made to d6bc9845ba.
a9a1eddba8
d6bc9845ba
[SVN r49246]