Revert "Use a patched version of orchestra/testbench"

This reverts commit 02378eae9cbbd84e3597ab56049f2fbd84012506.