Incorporate HawaiianSpork's pull request.