Revert "holiday: fix signal strength for 4.3"

This reverts commit d5c4c49d643689d22ba4afc9604815636cde0442.
Revert "Revert "holiday: clean up signal strength""

This reverts commit b43259b446480ca1c4a9260e27d14507cb25b053.