Should we have a JIRA issue for this?