Revert "ChannelSelection: Change bouquets over the previous service in history"

This reverts commit 07168f989b87c9b45369d6716a478b1f1aa6aeb0.

As it has not wanted side effects