fixes #8626 by reverting 0d8b81cd
Merge pull request #8627 from rghe/devel

fixes #8626 by reverting 0d8b81cd