Change from comment in pull request 487