Revert "Use a patched version of orchestra/testbench"

This reverts commit 2c553657bbf37a0e6ce002f72e397e1b0bb6d892.