Revert the Fix For VRT failures

[zutigrm]

Feature Description

Recently we implemented #7965 which was attempt to fix the failures in VRT, but since implementation, VRT is still consistent in failures, so we can consider reverting the edits done in linked issue, since it is not bringing expected improvements

---

Do not alter or remove anything below. The following sections will be managed by moderators only.

Acceptance criteria

Implementation Brief

Test Coverage

QA Brief

Changelog entry

[aaemnnosttv]

Closing in favor of #7965