Preserve 1:1 relationship between Channel and LogicalChannel

Fixes ticket #10040.

I'm not terribly familiar with this code, so I don't know what other impact this change might have.