Fix fallout from removing the spurious CMSIS