Reinstate perf test, adjust protocol to avoid recursion error