Revert r355188 as it shouldn't have created the risc-v directory at the top level.
Reported by: rpokala