I have changed my mind about this for this pull request. See below