Revert "DO NOT MERGE: Support for different number of signal bars"

This reverts commit adef83a204238d5d1e2bc5f9485f0ab9a05eea65.