Revert "Use a patched version of orchestra/testbench"

This reverts commit 9ae1b38028d2218507c16b4758aff2d21f212cde.