Revert "Use a patched version of orchestra/testbench"

This reverts commit 307568f734b88ada7e727ebfda148b2bd9461c5d.