@redmunds That was existing code, so I'm a little bit hesitant to touch it here. Maybe makes sense to fix as part of #7389?