Possible revert dubious commit 81afd2f90f81674cf1339644a95c4cfd3aa78298

[rmn30]

Commit 81afd2f was committed to support riscv-32 test elf files but we're not exactly sure why it was required. Once we have a diagnosis we should implement a proper fix.