Revert "fix WEB-3047 + test + Restore ignored tests"

This reverts commit 28cda0294e882a00509aba9c80f7d0be6e12e5fa.