[brcm-2.4] revert r15861 for generic-2.4 config