Revert #2792
Created by: tsenart
This reverts commit 1bc0f70827224fadf0fd4182a1a08d904481bed5 which made E2E tests fail, despite them passing in the PR.
Created by: tsenart
This reverts commit 1bc0f70827224fadf0fd4182a1a08d904481bed5 which made E2E tests fail, despite them passing in the PR.