Remove channel matchup and thus message rate.
Merge bug26090
Merge in default
...and thus remove some redundant code.