Undo regression from [16094].  Fixes #8332, Refs #8287
Undo regression from [16094].  Fixes #8332, Refs #8287

git-svn-id: 674a2d6b1e32e53f607eb824547723f32280967e@16216 560b804f-0ae3-0310-86f3-f6aa0a117693

redaktor/deliteful