Somehow out of the scope of this pull request though.