Regression fix : Revert #3776
Merge pull request #3833 from raven02/patch-16

Regression fix : Revert #3754