Merge "Add a hack for a RISC-V bug."