Partially revert '109808 baseband handling'

This partially reverts commit b432d30.