Apply patch from 8644.
Fixes #8644.

svn path=; revision=84713