Revert "Use a patched version of orchestra/testbench"

This reverts commit f7f824f44a2c2093e26d01e21427e960ea9e42bd.