Revert "Use a patched version of orchestra/testbench"

This reverts commit d1ad7b1f88ad788fb3d2503925f3bbcc3bd6ce5b.