Speculative fix to unbreak the buildbots that fail with compiler errors.