Fix buildbot error from #2329