Note this todo - we need to decide what to do about this.