Revert "Fixed Bug #4154"

This reverts commit 0f118b6dffaf2c59d1a53f0451504d91b0b4b004.