Should this be in this pull request?