Revert "WF 3.0 don't have bug EWF-1876. Removing tweaks which was introduced to bypass EWF-1876"

This reverts commit ac8e80be639604fbea4410298281246af22da279.