Revert r10553 "fix channel change bugs," causes kernel oopses. Closes #3213.