I suggest creating a task to do this, and submitting a separate PR.