Revert "Use a patched version of orchestra/testbench"

This reverts commit 6a402d41fcd7ab5bf94ee201f8f5ea47974d1b18.