This SHOULD have been a separate pull request. :)