Revert "Fixed Bug #7091"

This reverts commit adda8d74c3280ae1e3745591caafd9ce6e81ded7.

Signed-off-by: shennetsind <ind@henn.et>