Apply patch from #8692.
Refs #8692.

svn path=; revision=84763