Applied patch from #8032

svn path=; revision=84405