Final fix for C7 boards, which are still using ROMCC, to be able to