Apply patch from #8644.
Refs #8644.

svn path=; revision=84686