Revert "Use a patched version of orchestra/testbench"

This reverts commit 77f8ce637325a12d8f4d09a3ff4d19d5d1058bc9.