Good point. I think it was my attempt to accomplish what this pull request is accomplishing. I'm going to remove it as part of this PR.