Revert "Use a patched version of orchestra/testbench"

This reverts commit a6aaed033832fd343d5a1e57c7cd7a67925a5ce0.