Revert "Use a patched version of orchestra/testbench"

This reverts commit bd4e782693b523557a5ba86fd30decdc0578de78.