Revert "Bug 4154 fixed"

This reverts commit 81939eba38e4cc1f3138a14753aad25f05bfa4b0.