Regression fix : Revert #3776