Attempt another RISC-V patch set

With any luck this one will work?