Fix perf suite broken by descriptor change