Revert "Use a patched version of orchestra/testbench"

This reverts commit fd602e0c1d9789bf30010b38ce308b4a979766d7.