Revert "Use a patched version of orchestra/testbench"

This reverts commit efbc86a5e3df887130ebaff08913df4e271940f3.