Revert "Use a patched version of orchestra/testbench"

This reverts commit 61747f2ef6547babc9f15db40f66b7c117ea936f.