Revert "Fixed compatibility issue with QuickChannelSwitchCommand, and generally cleaned things up over there."

This reverts commit 1a18e7df81960fe71ec47c348c27e9af26f8eed8.