Revert "Use a patched version of orchestra/testbench"

This reverts commit c00741ba8413764af51d8d01a97c59e8dd5c99e4.