Revert "Channel/Sreq cleanup"
Merge pull request #18740 from saltstack/revert-18643-develop

Revert "Channel/Sreq cleanup"