Fix the CIS buildbot too.