Good catch, let's do this in a PR since it's not a regression of this changeset