Revert riscv elements and unstable-riscv feature

Revert riscv elements and unstable-riscv feature #553