Not dropping RISC-V support after all, maybe