Hmmm. Maybe it's too disruptive. Anyway, I am not going to do it as part of this JIRA but we can consider pulling that other JIRA in.