Revert "Add ChannelIcons to the list of "special" storage groups."

This reverts commit 88f380d100ca3e85c3ae26156eae8eb8b24400f6.

See 3d95e17