is this necessary for this pull request? Seems like a separate issue.