We should open a speparate issue for this.