This reverts commit 1fa2503f9d. Broke ofborg evals due to missing required argument sdvend49
1fa2503f9d