Revert "Use a patched version of orchestra/testbench"

This reverts commit 0227b21edbb3ddc6581ffac78631dc7ce4262e7b.