Revert "Fixed placement of else to fix channels being set incorrectly."

This reverts commit 652b5a391e225dac62bc76dbb3ed77ee6a25ba1f.