Revert "Use a patched version of orchestra/testbench"

This reverts commit 8d2d70d4a403fcfbf7e684fc61a1acc162273782.