Agreed, but don't think its an appropriate change for this PR.