r=(at troy's suggestion), bug 19382 git-svn-id: svn://10.0.0.236/trunk@55381 18797224-902f-48f8-a5cc-f745e15eee43