Revert "Use a patched version of orchestra/testbench"

This reverts commit 18c0fefec984e09f443b8cdf3bf2fb6564fe5fb3.