Oh, yeah, you're right, it was already there before. The wrapping was happening already. I thought I had introduced it in this jira. In that case yes, I'd rather have a separate jira to move the code.