Revert "Use a patched version of orchestra/testbench"

This reverts commit 53146cf981f39bede641113dd170700959b332c2.