[ImageBuilder] remove legacy 2.4-specific behavior, fixes IB on brcm-2.4