I don't disagree, but I don't think that should be part of this PR