Revert "Use a patched version of orchestra/testbench"

This reverts commit 1a5ce38c16c0778f8db279c908da9f56ba255a8e.