Revert "Use a patched version of orchestra/testbench"

This reverts commit fabfad12d6e45b74af6ad69a8ab4ce1117facf74.