Fixes #9332

[SVN r86626]