Fix perf trybots after recent refactor.