Agreed, but that is not part of this work pull request.
We'll have to defer this for now.