Revert "Use a patched version of orchestra/testbench"

This reverts commit 7bb0af974e988a9d57121bf77526e6deeec8fa84.