Fixes #7952

svn path=; revision=84546