Revert "Align combi ad-channel support from t7suite."

This reverts commit 4ee70ea3ff9ba49fa4a5090bfb4f87d4d6a76687.