This reverts commit d895fc9ac01db3d3420aa7c943949fe17b3ce028 since the test is problematic as described in the ticket. Backport of dfbdba924fd7cf12ce92f7a86b97590d25b75733 from master
This reverts commit d895fc9ac01db3d3420aa7c943949fe17b3ce028 since the test is problematic as described in the ticket. Backport of dfbdba924fd7cf12ce92f7a86b97590d25b75733 from master