Revert "Channel/Sreq cleanup"

Reverts saltstack/salt#18643