Restore bad pull request #483