I would have to do more than this to fix it, but it seems to be enough. svn-id: r35840
svn-id: r35037
svn-id: r35002