Revert 8418

[k-anshul]

Reverting 8418 because the change seems to be causing intermittent bad connection errors.
Will need to revisit or find alternate solutions for replication lag issue.

Checklist:

• Covered by tests
• Ran it and it works as intended
• Reviewed the diff before requesting a review
• Checked for unhandled edge cases
• Linked the issues it closes
• Checked if the docs need to be updated. If so, create a separate Linear DOCS issue
• Intend to cherry-pick into the release branch
• I'm proud of this work!