tentative fix for trac 9280

[SVN r86759]