Cleaning up third-party pull request #9