Bootloader broken on latest master

The bootloader on latest master always boots into MSC mode. Might have been introduced with the portexpander changeset.