The above PR is a related improvement but it's not the same thing, I'll create a new JIRA for that.