This seems to unbreak bootloader image generation with certain shells / build setups. Fixes #1766 (cherry picked from commit fdf552e5)
