I'll create a separate functional issue for this.