Should this be part of this pull request?