Unreviewed, fix cloop build.