Fixes #9338

[SVN r86748]