Revert "Use my patched version of orchestra/testbench"

This reverts commit 2293be2e466c89b12382374f9fce3d89a37d8cbe.