revert reuse channels

Revert reuse channels, #10297 which broke develop