Fixes #8277

svn path=; revision=84545